diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-06-23 07:33:50 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-06-23 07:33:50 +0300 |
| commit | 7759782ee7c4e654641c9f7abb51631c86e3f29c (patch) | |
| tree | f2fff5a65ea18924c9cd97b1534137600aba169b /source/blender/blenkernel/BKE_blender.h | |
| parent | ab9eee4bfb91e1147333b98516dba0e97c27d4de (diff) | |
| parent | f1917a2188df630d860a5ffa013d519f3d2d74c1 (diff) | |
Merge branch 'master' into UI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/editors/interface/resources.c
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 1af96f997ba..1638ba4521d 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 274 -#define BLENDER_SUBVERSION 6 +#define BLENDER_VERSION 275 +#define BLENDER_SUBVERSION 2 /* Several breakages with 270, e.g. constraint deg vs rad */ #define BLENDER_MINVERSION 270 #define BLENDER_MINSUBVERSION 5 |