Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-05-13 10:14:27 +02:00
commit 08ea1c2bdc
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
LICENSE
View file

@ -4,7 +4,7 @@
The code in that repository is mainly covered by *GPLv3*, except some 3rd party libs and resources. The code in that repository is mainly covered by *GPLv3*, except some 3rd party libs and resources.
ATTENTION: please be aware that some artwork has proprietary license. ATTENTION: please be aware that some artwork has proprietary license.
EXCEPTION of GPLv3 : EXCEPTION of GPLv3:
* Publishing applications using the OsmAnd GPLv3 code to Google Play, Amazon Market or Apple Store should be done with written permission* * Publishing applications using the OsmAnd GPLv3 code to Google Play, Amazon Market or Apple Store should be done with written permission*
Main AUTHORS (more detailed list in AUTHORS): Main AUTHORS (more detailed list in AUTHORS):
@ -40,13 +40,13 @@
* UI Design and UX work, such as layout, icons is covered by CC-BY-ND * UI Design and UX work, such as layout, icons is covered by CC-BY-ND
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd/res and others - https://github.com/osmandapp/Osmand/tree/master/OsmAnd/res and others
* Map icons are taken from sjjb and some are drawn and distributed under Public Domain (except icons8) * Map icons are taken from sjjb and some are drawn and distributed under Public Domain (except icons8)
- https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg - https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg
* Integration with QT library in (https://github.com/osmandapp/Osmand-core/) - dynamic linking * Integration with Qt library in (https://github.com/osmandapp/Osmand-core/) - dynamic linking
- LGPL (https://qt-project.org/products/licensing) - LGPL (http://www.qt.io/qt-licensing-terms/)
* Map icons and their derived primitives are covered by proprietary license: * Map icons and their derived primitives are covered by proprietary license:
- © icons8.com (https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg/icons8) - © icons8.com (https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg/icons8)
@ -96,7 +96,7 @@
- sqlite-jdbc-3.7.6.3-20110609.081603-3.jar - sqlite-jdbc-3.7.6.3-20110609.081603-3.jar
- h2-latest.jar - h2-latest.jar
* Special tools for new rendering (GPLv3) * Special tools for new rendering (GPLv3)
- https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-inspector - https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-inspector
- https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-verifier - https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-verifier
- https://github.com/osmandapp/OsmAnd-tools/tree/master/route-tester - https://github.com/osmandapp/OsmAnd-tools/tree/master/route-tester
@ -107,5 +107,3 @@
* Data files * Data files
- Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/geo-polygons © by Geofabrik - data free to use - Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/geo-polygons © by Geofabrik - data free to use
- Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons © by http://be.gis-lab.info - data free to use - Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons © by http://be.gis-lab.info - data free to use