diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-29 22:18:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-29 22:18:11 +0400 |
commit | 0d496b8dcea0190226d7ac8804be2c70f081f7b5 (patch) | |
tree | ed5f5836235136e26daf7c6939640abec916a05e | |
parent | bcf32407c115753ba1236a37a6a8fed592446d8f (diff) |
svn merge ^/tags/blender-2.67b-release/blender -c57122
-rw-r--r-- | release/datafiles/splash.png | bin | 94527 -> 94411 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 440cd65e06a..01d903c457b 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 c17cfca70be..2dfdce49a71 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 a +#define BLENDER_VERSION_CHAR b /* alpha/beta/rc/release, docs use this */ #define BLENDER_VERSION_CYCLE alpha |