Tamito Kajiyama ac9ec06ec1 Merged changes in the trunk up to revision 54421. ... Conflicts resolved: release/datafiles/startup.blend release/scripts/startup/bl_ui/properties_render.py source/blender/SConscript source/blender/blenloader/intern/readfile.c		2013-02-10 10:17:59 +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 54421.	2013-02-10 10:17:59 +00:00
creator.c	Merged changes in the trunk up to revision 54421.	2013-02-10 10:17:59 +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