Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-07-12 10:55:33 +02:00
commit 266c6ec487
2 changed files with 2 additions and 1 deletions

1
OsmAnd/.gitignore vendored
View file

@ -13,4 +13,5 @@ use/
osmand.properties
osmand.xml
assets/help/*.html
assets/help/images
assets/help/screens

View file

@ -37,7 +37,7 @@
<copy todir="assets/help/">
<fileset dir="../../help/" >
<include name="*.html"/>
<include name="screens/**/*.png"/>
<include name="images/**/*.png"/>
</fileset>
</copy>
<copy todir="${src.absolute.dir}/net/osmand/render/">