diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-18 12:52:34 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-18 12:52:34 +0400 |
commit | f00d43ba7fe58cabb7aa889340440cef8e02e4fc (patch) | |
tree | 1de9433602b2b9166701afd78bd8efdac5514d13 | |
parent | ce744677d0fae047b0ea4dea465a1722f06e3f30 (diff) |
svn merge ^/trunk/blender -c56890
-rw-r--r-- | release/datafiles/splash.png | bin | 115554 -> 94527 bytes | |||
-rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png Binary files differindex 5b3dddd535e..440cd65e06a 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index ba17bdb2e8c..bedd3f97160 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -50,7 +50,7 @@ extern "C" { /* used by packaging tools */ /* can be left blank, otherwise a,b,c... etc with no quotes */ -#define BLENDER_VERSION_CHAR +#define BLENDER_VERSION_CHAR a /* alpha/beta/rc/release, docs use this */ #define BLENDER_VERSION_CYCLE release |