forked from bartvdbraak/blender
385c72f5f2
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. |
||
---|---|---|
.. | ||
freestyle | ||
modules | ||
presets | ||
startup | ||
templates_osl | ||
templates_py |