Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-08-13 02:40:01 +02:00
commit 052f028f68

View file

@ -4,6 +4,8 @@
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 :
* 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):
Victor Shcherb all parts of the project, originator Victor Shcherb all parts of the project, originator