icons/add-triangle.png@4355e72ffd47
icons/add-triangle.png
Wed, 23 Oct 2013 12:46:10 +0300
- author
- Santeri Piippo <crimsondusk64@gmail.com>
- date
- Wed, 23 Oct 2013 12:46:10 +0300
- changeset 665
- 4355e72ffd47
- parent 159
- 7afedbbefeb0
- child 729
- dcd7e3e86374
- permissions
- -rw-r--r--
Merge branch 'master' into gl
Conflicts:
src/file.cpp
src/gldraw.cpp
src/gldraw.h
src/gui.cpp
src/ldtypes.cpp
src/src.pro
src/types.h
