LICENSE.icons@9e9c52ca955e
LICENSE.icons
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 241
- cffab8e109f6
- 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
For the graphical assets (i.e. anything in the icons/) directory of the source tree, the CC 3.0 BY-SA license applies. See http://creativecommons.org/licenses/by-sa/3.0/ for details about the license.
