Merge branch 'master' of ssh://github.com/osmandapp/Osmand

This commit is contained in:
Victor Shcherb 2014-10-03 17:16:25 +02:00
commit bdc984c640

View file

@ -33,6 +33,7 @@
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd - https://github.com/osmandapp/Osmand/tree/master/OsmAnd
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java - https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java
- https://github.com/osmandapp/Osmand-core/tree/legacy_core - https://github.com/osmandapp/Osmand-core/tree/legacy_core
- https://github.com/osmandapp/Osmand-core/
- https://github.com/osmandapp/OsmAnd-misc - https://github.com/osmandapp/OsmAnd-misc
- https://github.com/osmandapp/OsmAnd-tools - https://github.com/osmandapp/OsmAnd-tools
- https://github.com/osmandapp/OsmAnd-resources - https://github.com/osmandapp/OsmAnd-resources
@ -40,6 +41,9 @@
* 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
* Integration with QT library in (https://github.com/osmandapp/Osmand-core/) - dynammic linking
- LGPL (https://qt-project.org/products/licensing)
* Map icons and their derived primities are covered by proprietary license: * Map icons and their derived primities 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)
@ -88,7 +92,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) - © Alexey Pelykh * 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