Arystanbek Dyussenov 0c899f7ded Merge -c 26209,26214,26443 from COLLADA branch into trunk.		2010-01-30 18:20:56 +00:00
..
blender	Merge -c 26209,26214,26443 from COLLADA branch into trunk.	2010-01-30 18:20:56 +00:00
blenderplayer	Removing duplicate bad level call entries, patch from Richard Sanger, thanks	2010-01-30 00:47:41 +00:00
creator	workaround for running python scripts before the contexts values are set.	2010-01-27 11:18:55 +00:00
darwin	OS X Makefiles:	2010-01-03 20:35:13 +00:00
gameengine	same fix from 2.4x r26392.	2010-01-29 09:56:32 +00:00
icons	Merge from trunk -r 22040:23000.	2009-10-19 16:20:12 +00:00
kernel	Merge from trunk -r 22040:23000.	2009-10-19 16:20:12 +00:00
CMakeLists.txt
Makefile	Change order of linking slightly so things link.	2010-01-22 16:28:16 +00:00
nan_compile.mk	Drag and drop 2.5 integration! Finally, slashdot regulars can use	2010-01-26 18:18:21 +00:00
nan_definitions.mk	Drag and drop 2.5 integration! Finally, slashdot regulars can use	2010-01-26 18:18:21 +00:00
nan_link.mk	add OpenCOLLADA support to Makefiles	2010-01-10 09:11:48 +00:00
nan_subdirs.mk
nan_warn.mk
SConscript	Merge from trunk -r 22040:23000.	2009-10-19 16:20:12 +00:00