Tamito Kajiyama 385c72f5f2 Merged changes in the trunk up to revision 55546. ... Conflicts resolved: source/blenderplayer/bad_level_call_stubs/SConscript Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899 to make it easier to merge trunk changes.		2013-03-24 12:13:13 +00:00
..
build_environment	Merged changes in the trunk up to revision 55546.	2013-03-24 12:13:13 +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