Brecht Van Lommel c7fce6be2e Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender		2011-08-16 18:59:45 +00:00
..
modules	Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-08-16 18:59:45 +00:00
presets	fix for xvid encoding preset giving a python error	2011-08-02 17:40:27 +00:00
startup	Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-08-16 18:59:45 +00:00
templates	Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2011-08-16 18:59:45 +00:00