Alexey Pelykh cea31a170c Merge branch 'master' of ssh://github.com/osmandapp/Osmand ... Conflicts: OsmAnd/res/values-de/strings.xml		2014-11-28 19:15:19 +02:00
..
bidforfix.xml	Update bidforfix.xml	2014-11-28 15:21:12 +01:00
phrases.xml	Update phrases.xml	2014-11-28 15:23:47 +01:00
strings.xml	Merge branch 'master' of ssh://github.com/osmandapp/Osmand	2014-11-28 19:15:19 +02:00
strings.xml.orig	Merge branch 'master' of ssh://github.com/osmandapp/Osmand	2014-11-28 19:15:19 +02:00