Tamito Kajiyama 5524ed9ba2 Merged changes in the trunk up to revision 55700. ...

Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h

2013-04-01 13:47:19 +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 55700.

2013-04-01 13:47:19 +00:00

creator.c

Merged changes in the trunk up to revision 55546.

2013-03-24 12:13:13 +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