Merging trunk into soc-2011-tomato.
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 22 Aug 2011 19:30:05 +0000 (19:30 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 22 Aug 2011 19:30:05 +0000 (19:30 +0000)
commitffaa5d0210577c215d14924e6321d6f6420da5ce
tree3caccec44c93739c3cba21b4dffa5920994f9aba
parent62f553cc56c0e2f74e28538be507d150a5f6c591
parente39cb8a0401c876fcfb9d7d00a1daffd8c970549
Merging trunk into soc-2011-tomato.

Pardon, lost message about which revisions are going to be merged..
25 files changed:
CMakeLists.txt
build_files/scons/config/linuxcross-config.py
build_files/scons/config/win32-mingw-config.py
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
release/scripts/startup/bl_ui/__init__.py
release/scripts/startup/bl_ui/properties_data_camera.py
release/scripts/startup/bl_ui/space_userpref_keymap.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenlib/intern/math_rotation.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform.c
source/blender/imbuf/intern/filter.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_sequencer.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/initrender.c
source/blender/windowmanager/intern/wm_operators.c
source/creator/CMakeLists.txt
source/creator/creator.c