Merge with 2.5 -r 21003:21788.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Wed, 22 Jul 2009 05:35:12 +0000 (05:35 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Wed, 22 Jul 2009 05:35:12 +0000 (05:35 +0000)
Run smoothly :)

1  2 
config/linux2-config.py
source/blender/SConscript
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_edit.c
source/blender/windowmanager/intern/wm_operators.c
tools/Blender.py
tools/btools.py

Simple merge
Simple merge
Simple merge
diff --cc tools/btools.py
Simple merge