icons/add-condline.png@b4a990f59a5e
icons/add-condline.png
Thu, 17 Apr 2014 20:50:43 +0300
- author
- Santeri Piippo <crimsondusk64@gmail.com>
- date
- Thu, 17 Apr 2014 20:50:43 +0300
- changeset 714
- b4a990f59a5e
- parent 159
- 7afedbbefeb0
- child 729
- dcd7e3e86374
- permissions
- -rw-r--r--
Merge ../ldforge into gl
Conflicts:
src/actionsEdit.cc
src/glRenderer.cc
src/ldDocument.cc
