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)
1  2 
source/blender/makesrna/intern/rna_ui_api.c
source/blender/modifiers/intern/MOD_ocean.c