Alexander Sytnyk 4e134d0292 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into menu_behavior ... # Conflicts: # OsmAnd/res/values-large/sizes.xml # OsmAnd/res/values/colors.xml # OsmAnd/res/values/sizes.xml		2018-01-11 15:36:32 +02:00
..
attrs.xml	Fix night text color in context menu	2018-01-10 12:10:57 +02:00
colors.xml	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into menu_behavior	2018-01-11 15:36:32 +02:00
dimens.xml	Refactoring mapillary controls	2017-05-04 23:48:07 +03:00
fonts.xml
ids.xml	Change the radius of the circles; remove the selection of modes from configure screen	2017-07-12 14:02:45 +03:00
phrases.xml	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into context_menu	2017-12-15 13:39:20 +02:00
routepoints.xml
sherpafy.xml	Replaced three dots with recommended unicode character. And tiny layout XML fixes.	2015-12-01 10:52:25 +02:00
sizes.xml	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into menu_behavior	2018-01-11 15:36:32 +02:00
strings.xml	Correct grammar / spelling according to #4902.	2018-01-07 13:47:54 +01:00
styles.xml	Add menu controller text color to styles	2018-01-11 12:26:52 +02:00