This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

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

5.6 KiB

Raw Blame History

View Raw