diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 21:54:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-05 21:54:33 +0400 |
| commit | d97f88d2786ec78df321980cd333408648bd4419 (patch) | |
| tree | 08c93875b62f1eadf4fe876a80817d896002930c /source/blender/blenkernel/BKE_blender.h | |
| parent | 824bfa98c3a8350dc9030907d9ad6a5ec5919945 (diff) | |
| parent | c40d8921b8b61c0465a2fe9bca72dc418bf39c7d (diff) | |
svn merge ^/trunk/blender -r42426:42439
Diffstat (limited to 'source/blender/blenkernel/BKE_blender.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 50a1331d7ab..a8819b1cda6 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -42,7 +42,7 @@ extern "C" { * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 260 -#define BLENDER_SUBVERSION 6 +#define BLENDER_SUBVERSION 7 #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 a /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE beta +#define BLENDER_VERSION_CYCLE rc extern char versionstr[]; /* from blender.c */ |