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
..
bin	A big cleaning patch by Bastien Montagne (thanks a lot!)	2012-12-11 22:00:22 +00:00
darwin	set line endings to native & mime type to text/plain for .app/Contents/MacOS/xxx files.	2012-12-29 03:19:30 +00:00
datafiles	Merged changes in the trunk up to revision 55546.	2013-03-24 12:13:13 +00:00
freedesktop	patch to our desktop file from debian, German translation.	2012-04-16 09:56:12 +00:00
scripts	Merged changes in the trunk up to revision 55546.	2013-03-24 12:13:13 +00:00
text	Release Cycle:	2013-01-17 00:56:04 +00:00
windows	style cleanup	2013-03-08 04:00:06 +00:00
environment-macosx
environment-mswindows
environment-unix