Sun, 09 Mar 2014 14:59:46 +0200
Merge ../ldforge into gl Conflicts: src/Document.cc src/Document.h src/GLRenderer.cc src/LDObject.cc src/LDObject.h src/Types.h src/actions/EditActions.cc
(binary:image/png)