changelog
Merge ../ldforge into gl
- Sun, 09 Mar 2014 14:59:46 +0200
- by Santeri Piippo <crimsondusk64@gmail.com> [Sun, 09 Mar 2014 14:59:46 +0200] rev 690
- 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
