diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 12:22:03 +0400 |
| commit | 43ab8e86247b7889d16d915b4f370ceb618aaad4 (patch) | |
| tree | 64b1fec1adcc399eb1de5cd86ebafd753a921d8d /source/blender/blenkernel/BKE_blender.h | |
| parent | 5b5e600db6f529ad7e1af9d4bb3a193be2265342 (diff) | |
| parent | d049a722fea3d150fbfad06ffdbbb5c150717134 (diff) | |
* Merge trunk up to r39790.soc-2011-pepper
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
Diffstat (limited to 'source/blender/blenkernel/BKE_blender.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 162b0de1d5a..0f19cfbc481 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -44,7 +44,7 @@ extern "C" { * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 259 -#define BLENDER_SUBVERSION 0 +#define BLENDER_SUBVERSION 1 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 |