Merging r50470 through r50477 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 8 Sep 2012 10:17:42 +0000 (10:17 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 8 Sep 2012 10:17:42 +0000 (10:17 +0000)
commit37a70492d145971e9b9800ac89e4a9b72d621d93
tree46778bf81ae957a343dbda2785b147b6383ae329
parent62076905a3e732e331a9c6a157f861a09b4ebbec
Merging r50470 through r50477 from trunk into soc-2011-tomato
35 files changed:
intern/ghost/intern/GHOST_C-api.cpp
intern/ghost/test/multitest/EventToBuf.c
intern/ghost/test/multitest/MultiTest.c
intern/utfconv/utf_winfunc.c
release/datafiles/fonts/droidsans.ttf.gz
source/blender/blenfont/intern/blf_lang.c
source/blender/blenkernel/intern/implicit.c
source/blender/blenkernel/intern/text.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenlib/BLI_math_base.h
source/blender/blenlib/BLI_utildefines.h
source/blender/bmesh/intern/bmesh_core.c
source/blender/bmesh/intern/bmesh_operators.c
source/blender/compositor/intern/COM_OpenCLDevice.cpp
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/mesh/editmesh_rip.c
source/blender/editors/space_info/info_stats.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_relationships.c
source/blender/editors/transform/transform.c
source/blender/imbuf/intern/anim_movie.c
source/blender/imbuf/intern/indexer.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_define.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/nodes/composite/nodes/node_composite_channelMatte.c
source/blender/python/generic/bgl.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_window.c
source/darwin/blender.app/Contents/Info.plist
source/darwin/blenderplayer.app/Contents/Info.plist