Campbell Barton 25098c741b svn merge ^/trunk/blender -r42292:42303		2011-12-01 00:34:59 +00:00
build_files	svn merge ^/trunk/blender -r42182:42194	2011-11-27 21:18:59 +00:00
doc	corrections for docs	2011-11-28 17:19:25 +00:00
extern	Fix link errors for MinGW debug for blenderplayer. This bizarre error, not present in release builds, happens due to name clashes between tracker functions. static-fied them so the linker stops complaining.	2011-11-29 20:06:36 +00:00
intern	svn merge ^/trunk/blender -r42292:42303	2011-12-01 00:34:59 +00:00
release	svn merge ^/trunk/blender -r42261:42290	2011-11-30 09:31:11 +00:00
source	svn merge ^/trunk/blender -r42292:42303	2011-12-01 00:34:59 +00:00
CMakeLists.txt	svn merge -r41779:41847 ^/trunk/blender	2011-11-15 02:58:06 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	minor changes	2011-11-23 17:14:29 +00:00
SConstruct	exclude addons_contrib/ for release builds.	2011-11-17 19:43:59 +00:00