Files
test2/doc/python_api/rst
Tamito Kajiyama 385c72f5f2 Merged changes in the trunk up to revision 55546.
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript

Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
2013-03-24 12:13:13 +00:00
..
2012-07-04 12:19:50 +00:00
2012-12-11 02:13:42 +00:00