diff options
| author | Ton Roosendaal <ton@blender.org> | 2007-12-24 22:13:04 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2007-12-24 22:13:04 +0300 |
| commit | 25135a201b32f4c579758bfdd33fab36c0b12a7c (patch) | |
| tree | 9c7bf88b3ab37ac79156768c967328c81abac645 /source/blender/blenkernel/BKE_blender.h | |
| parent | 8c91939824ab992c4c28ad6d402259c6cf38c646 (diff) | |
- removing conflicts in svn merge (didnt notice)
- adding more Makefiles
Diffstat (limited to 'source/blender/blenkernel/BKE_blender.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 245d61f3f7e..472aa4eb834 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -44,13 +44,8 @@ struct ListBase; struct MemFile; struct bContext; -<<<<<<< .mine #define BLENDER_VERSION 250 #define BLENDER_SUBVERSION 0 -======= -#define BLENDER_VERSION 245 -#define BLENDER_SUBVERSION 12 ->>>>>>> .r12991 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 |