diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-15 22:32:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-15 22:32:08 +0400 |
commit | 78f9bb6e913c6c87080c9bf1a91712d83a415154 (patch) | |
tree | 4dd8f90a0b0c37cfab7ed98195809bbff8348be6 /source/blender/blenkernel/BKE_blender.h | |
parent | 576ce5928f184b4f78dc0b48fdb8726cf320047b (diff) | |
parent | 93526b4c72f76f8d8d382a11e7d0f8e4f21c4a7c (diff) |
svn merge ^/trunk/blender -r44118:44136
Diffstat (limited to 'source/blender/blenkernel/BKE_blender.h')
-rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 66b2c74d758..afa4752f1ff 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -41,8 +41,8 @@ extern "C" { /* these lines are grep'd, watch out for our not-so-awesome regex * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ -#define BLENDER_VERSION 261 -#define BLENDER_SUBVERSION 4 +#define BLENDER_VERSION 262 +#define BLENDER_SUBVERSION 0 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 @@ -51,7 +51,7 @@ extern "C" { /* can be left blank, otherwise a,b,c... etc with no quotes */ #define BLENDER_VERSION_CHAR /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE rc +#define BLENDER_VERSION_CYCLE release extern char versionstr[]; /* from blender.c */ |