Thomas Dinges 95080ea5cd Freestyle / Scons: ... * Changes in tools\Blender.py were not merged, causing compile failure.		2013-04-06 22:21:42 +00:00
build_files	Freestyle / Scons:	2013-04-06 22:21:42 +00:00
doc	svn merge ^/trunk/blender -r55776:55813	2013-04-05 15:42:31 +00:00
extern	Revert change made to bilinear sampler in libmv	2013-04-06 14:47:45 +00:00
intern	svn merge ^/trunk/blender -r55815:55840	2013-04-06 13:24:34 +00:00
release	Part I of the Freestyle branch merger: new 'freestyle' folders.	2013-04-06 15:45:02 +00:00
source	Whoops, revert r55854 and use r48292 as is	2013-04-06 21:48:39 +00:00
CMakeLists.txt	svn merge ^/trunk/blender -r55700:55776	2013-04-04 13:37:07 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	correct too-big allocation in mesh beautify.	2013-04-01 07:57:33 +00:00
SConstruct	Merged changes in the trunk up to revision 55546.	2013-03-24 12:13:13 +00:00