icons/add-triangle.png@d79083b9f74d
icons/add-triangle.png
Sat, 29 Mar 2014 05:38:03 +0200
- author
- Santeri Piippo <crimsondusk64@gmail.com>
- date
- Sat, 29 Mar 2014 05:38:03 +0200
- changeset 706
- d79083b9f74d
- parent 159
- 7afedbbefeb0
- child 729
- dcd7e3e86374
- permissions
- -rw-r--r--
Merge ../ldforge into gl
Conflicts:
CMakeLists.txt
src/actions.cc
src/glRenderer.cc
src/glRenderer.h
src/ldDocument.cc
src/ldDocument.h
src/ldObject.cc
src/ldObject.h
src/main.cc
