LICENSE.icons

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 241
cffab8e109f6
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

241
cffab8e109f6 Added LICENSE.icons to help clarity on the licensing of the icons
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
1 For the graphical assets (i.e. anything in the icons/) directory of the source tree, the CC 3.0 BY-SA license applies.
cffab8e109f6 Added LICENSE.icons to help clarity on the licensing of the icons
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
2 See http://creativecommons.org/licenses/by-sa/3.0/ for details about the license.

mercurial