Tamito Kajiyama d433cd65f7 Merged changes in the trunk up to revision 53146. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c

2012-12-19 01:49:58 +00:00

..

blender.map

Mark boost symbols as local

2012-11-27 10:24:18 +00:00

buildinfo.c

style cleanup: mostly whitespace in rna

2012-05-12 11:01:29 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

creator.c

Merged changes in the trunk up to revision 53146.

2012-12-19 01:49:58 +00:00

osx_locals.map

OSX/scons: introducing and testing an unexported_symbols_list to prevent clashes, todo: cmake

2012-11-27 11:38:59 +00:00