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

..

bad_level_call_stubs

Merged changes in the trunk up to revision 55357.

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

CMakeLists.txt

Patch [#34373] Use i18n monospace font in Text editor and Python console

2013-03-12 07:25:53 +00:00