Merging r39330 through r39390 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 14 Aug 2011 11:17:39 +0000 (11:17 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 14 Aug 2011 11:17:39 +0000 (11:17 +0000)
commiteb110bd38114acabe5f02c543a2be5024b6db219
tree015f7edafbcc18fcbadce5ada92cc75b84e98ea5
parent36c5f5761686c76edf03e1a89c683a7be2a8583c
parent540f0c64b5d42186119a1e1ccdd9aac7edd13960
Merging r39330 through r39390 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_sequencer.py
release/scripts/startup/bl_ui/space_time.py
release/scripts/startup/bl_ui/space_userpref_keymap.py
source/blender/blenkernel/intern/node.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_intern.h
source/blender/editors/space_sequencer/sequencer_ops.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/makesrna/RNA_access.h
source/blender/modifiers/intern/MOD_uvproject.c