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
..
build_environment	install_deps.sh:	2013-02-24 11:54:28 +00:00
buildbot	Woops, installing dlls shall happen after all the folders are created.	2013-03-12 09:24:52 +00:00
cmake	code cleanup: quiet some -Wshadow warnings, mix of obvious mistakes and harmless global/local naming conflict.	2013-03-15 22:55:10 +00:00
package_spec	Add datafiles/locale/languages to blender.spec.in for CPack	2012-12-28 23:30:34 +00:00
scons	Merged changes in the trunk up to revision 55357.	2013-03-18 00:48:59 +00:00