Merging r50016 through r50021 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 19 Aug 2012 15:44:59 +0000 (15:44 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 19 Aug 2012 15:44:59 +0000 (15:44 +0000)
commitfb5c39f5c270e3b8a08beed535b5d72f4cd376de
tree82ec82cfddabccd9bcd89346f37fa6ec42cbf9cf
parent21e403e546398959fd3d7ce18c97091d9dae4538
parent995a19a983b2c44ec9afec049395d7c1b4320137
Merging r50016 through r50021 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_image.py
release/scripts/startup/bl_ui/space_sequencer.py
source/blender/blenkernel/BKE_colortools.h
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/sequencer.c
source/blender/makesrna/intern/rna_ui_api.c