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
..
bl_operators	Merged changes in the trunk up to revision 55357.	2013-03-18 00:48:59 +00:00
bl_ui	Merged changes in the trunk up to revision 55357.	2013-03-18 00:48:59 +00:00
keyingsets_builtins.py	More UI message i18n fixes and improvements...	2013-03-10 17:42:08 +00:00