Tamito Kajiyama c1ceab1281 Merged changes in the trunk up to revision 55357. ...

Resolved conflicts:
release/datafiles/startup.blend
source/blender/editors/space_nla/nla_buttons.c

Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of
recent changes for the use of bool.

2013-03-18 00:48: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 55357.

2013-03-18 00:48:59 +00:00

creator.c

Merged changes in the trunk up to revision 54802.

2013-02-24 03:39:20 +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