forked from bartvdbraak/blender
68ae82bb47
Conflicts resolved: source/blender/editors/include/UI_resources.h source/blender/editors/interface/resources.c source/blender/makesrna/intern/rna_scene.c |
||
---|---|---|
.. | ||
blender | ||
blenderplayer | ||
creator | ||
darwin | ||
gameengine | ||
icons | ||
tests | ||
CMakeLists.txt | ||
SConscript |