Tamito Kajiyama 3789c398ff Merged changes in the trunk up to revision 34828. ...

Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h

2011-02-13 23:47:30 +00:00

..

buildinfo.c

split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.

2011-01-07 18:36:47 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

creator.c

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

SConscript

Merged changes in the trunk up to revision 32886.

2010-11-05 21:49:36 +00:00