Campbell Barton 685041d53a svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs		2011-11-10 03:05:11 +00:00
build_files	svn merge ^/trunk/blender -r41602:41638 .	2011-11-08 02:57:28 +00:00
doc	cmake & pep8 tidy up, also some style edits.	2011-11-08 01:32:34 +00:00
extern	cmake & pep8 tidy up, also some style edits.	2011-11-08 01:32:34 +00:00
intern	svn merge ^/trunk/blender -r41503:41575	2011-11-06 10:38:44 +00:00
release	add clip.py and space_clip.py, needed for last merge with trunk	2011-11-08 20:40:27 +00:00
source	svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs	2011-11-10 03:05:11 +00:00
CMakeLists.txt	svn merge ^/trunk/blender -r41602:41638 .	2011-11-08 02:57:28 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	remove po/ since the workflow for translations uses branches which isnt that useful to have within blenders source dir.	2011-11-05 14:26:18 +00:00
SConstruct	Modifier compilation tweaks (Blender conference commit)	2011-10-29 23:56:07 +00:00