diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-14 04:30:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-14 04:30:31 +0400 |
| commit | a3bdb2d8256263c7cf8eea21f4ba89c7a38e483f (patch) | |
| tree | 13bb97b5f9d9d3a71b150459f38149dd5d23557e /source/blender/blenkernel/BKE_blender.h | |
| parent | 6254cc1c70b06acd60131b9ae3b0993e258e4e33 (diff) | |
| parent | a7823dda6941420ba1317ac3682c8b563a47023c (diff) | |
svn merge ^/trunk/blender -r42586:42617
Diffstat (limited to 'source/blender/blenkernel/BKE_blender.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index b9c0984ccc3..6e578c24137 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -41,17 +41,17 @@ 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 260 -#define BLENDER_SUBVERSION 8 +#define BLENDER_VERSION 261 +#define BLENDER_SUBVERSION 0 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 /* 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 /* alpha/beta/rc/release, docs use this */ -#define BLENDER_VERSION_CYCLE rc +#define BLENDER_VERSION_CYCLE release extern char versionstr[]; /* from blender.c */ |