icons/bomb.png@9e9c52ca955e
icons/bomb.png
Sun, 09 Mar 2014 14:59:46 +0200
- author
- Santeri Piippo <crimsondusk64@gmail.com>
- date
- Sun, 09 Mar 2014 14:59:46 +0200
- changeset 690
- 9e9c52ca955e
- parent 237
- ec77f6e9a19f
- permissions
- -rw-r--r--
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
