svn merge ^/trunk/blender -r49167:49175
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 12:38:37 +0000 (12:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 12:38:37 +0000 (12:38 +0000)
commitf7a1819559ba95dffb6c7cf319113b8d37888b5a
treeaf89d41d96b197d6f861d683a6a3c21cbc7956da
parenta6d62e9e87d460473f16ddd1fccc319ffd9b9246
parentc67e910df6f3608ee01a1f3bb757b922e9c51b41
svn merge ^/trunk/blender -r49167:49175
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/makesdna/DNA_node_types.h