Merge from 2.5 r21037 through r21112
authorArystanbek Dyussenov <arystan.d@gmail.com>
Tue, 23 Jun 2009 19:17:59 +0000 (19:17 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Tue, 23 Jun 2009 19:17:59 +0000 (19:17 +0000)
1  2 
release/ui/buttons_data_armature.py
release/ui/buttons_data_camera.py
release/ui/buttons_data_curve.py
release/ui/buttons_data_lamp.py
release/ui/buttons_data_lattice.py
release/ui/buttons_data_mesh.py
release/ui/buttons_data_text.py
release/ui/buttons_material.py
release/ui/buttons_texture.py
release/ui/buttons_world.py

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge