GaidamakUA a46b3e4ba0 Merge remote-tracking branch 'osmandapp/master' into poi_dialog ... # Conflicts: # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java # OsmAnd/src/net/osmand/plus/dashboard/DashRateUsFragment.java # OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java # OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java		2015-08-12 17:28:33 +03:00
..
bidforfix.xml	Committed translation (lt).	2012-07-05 03:35:40 +00:00
strings.xml	Merge remote-tracking branch 'osmandapp/master' into poi_dialog	2015-08-12 17:28:33 +03:00