madwasp79 2a832dd99a Merge branch 'master' into app_profiles_2 ... # Conflicts: # OsmAnd/res/values/strings.xml		2019-05-28 13:30:04 +03:00
..
attrs.xml	Added pages control to route details	2019-03-30 17:49:47 +03:00
colors.xml	Add compass ruler control initial commit	2019-05-24 18:19:51 +03:00
dimens.xml	Refactoring mapillary controls	2017-05-04 23:48:07 +03:00
fonts.xml
ids.xml	Add compass ruler control initial commit	2019-05-24 18:19:51 +03:00
phrases.xml	Update phrases.xml	2019-05-10 22:43:17 +03:00
routepoints.xml
sherpafy.xml
sizes.xml	added cancel button to profile's bottomsheets	2019-05-24 14:35:24 +03:00
strings.xml	Merge branch 'master' into app_profiles_2	2019-05-28 13:30:04 +03:00
styles.xml	Added pages control to route details	2019-03-30 17:49:47 +03:00