Campbell Barton 5600d214f1 svn merge ^/trunk/blender -r41939:41954		2011-11-18 05:06:53 +00:00
..
modules	svn merge ^/trunk/blender -r41939:41954	2011-11-18 05:06:53 +00:00
presets	svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined	2011-11-16 19:06:38 +00:00
startup	svn merge ^/trunk/blender -r41939:41954	2011-11-18 05:06:53 +00:00
templates	rename user interface operator properties from 'op' to 'props'	2011-10-23 00:53:50 +00:00