4c36a26af5
Conflicts resolved: source/blender/editors/interface/resources.c source/blender/editors/mesh/editmesh_select.c source/blender/editors/space_view3d/drawobject.c |
||
---|---|---|
.. | ||
buildinfo.c | ||
CMakeLists.txt | ||
creator.c | ||
SConscript |