Campbell Barton 121ff4223d svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

..

bl_operators

add clip.py and space_clip.py, needed for last merge with trunk

2011-11-08 20:40:27 +00:00

bl_ui

add clip.py and space_clip.py, needed for last merge with trunk

2011-11-08 20:40:27 +00:00

keyingsets_builtins.py

svn merge -r41171:41170 . --- fix coming next

2011-10-21 08:31:28 +00:00