Sat, 07 Sep 2013 13:23:09 +0300
Merge branch 'master' into gl, reworked stuff
Conflicts:
src/gldraw.cpp
src/gldraw.h
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. |