Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-02-05 10:20:06 +01:00
commit cf5f4fc573
3 changed files with 3 additions and 3 deletions

View file

@ -131,7 +131,7 @@
<activity android:name="net.osmand.plus.monitoring.SettingsMonitoringActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.rastermaps.SettingsRasterMapsActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.routepointsnavigation.RoutePointsActivity" />
<activity android:name="net.osmand.plus.dashboard.DashAudioVideoNotesActivity" />
<activity android:name="net.osmand.plus.audionotes.DashAudioVideoNotesActivity" />
<activity android:name="net.osmand.plus.osmedit.SettingsOsmEditingActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.development.SettingsDevelopmentActivity" android:configChanges="keyboardHidden|orientation" />

View file

@ -51,7 +51,7 @@
<fragment
android:id="@+id/NotesFragment"
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
android:name="net.osmand.plus.audionotes.DashAudioVideoNotesFragment"
android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

View file

@ -59,7 +59,7 @@
<fragment
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/NotesFragment"
android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
android:name="net.osmand.plus.audionotes.DashAudioVideoNotesFragment"
android:layout_marginTop="@dimen/dashCardMargin"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>