svn merge ^/trunk/blender -r42069:42076
authorCampbell Barton <ideasman42@gmail.com>
Tue, 22 Nov 2011 18:15:08 +0000 (18:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 22 Nov 2011 18:15:08 +0000 (18:15 +0000)
commitac814498a213d436c2349e8ff55fe802cdb7376e
tree38c8e0ce3d844804cc6dbb35f068a315e207a8df
parentc6391e8d2394b8d022b03f48941b235b96d677d0
parentb78701f6fe1daa33c38a7b72563565c09677f325
svn merge ^/trunk/blender -r42069:42076
source/blender/makesrna/intern/rna_ui_api.c
source/blender/modifiers/intern/MOD_ocean.c