diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-05-23 22:45:38 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-05-23 22:45:38 +0200 |
| commit | d343ed92650db40eb65c5af4eb35f05428fc061b (patch) | |
| tree | 69587081b01968f69dc2e4337390f8a42e973d3d /main/AndroidManifest.xml | |
| parent | 4f7a06483c5a3ef3b68b8e458005b82f3d8aa68a (diff) | |
| parent | f308e72b49d303b897d2b95b39328fe251dfc691 (diff) | |
| download | cgeo-d343ed92650db40eb65c5af4eb35f05428fc061b.zip cgeo-d343ed92650db40eb65c5af4eb35f05428fc061b.tar.gz cgeo-d343ed92650db40eb65c5af4eb35f05428fc061b.tar.bz2 | |
Merge remote-tracking branch 'campbeb/refactorTrackable' into upstream
Conflicts:
main/src/cgeo/geocaching/LogTrackableActivity.java
Diffstat (limited to 'main/AndroidManifest.xml')
| -rw-r--r-- | main/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index f886cd8..5353785 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -149,7 +149,7 @@ android:configChanges="keyboardHidden|orientation" > </activity> <activity - android:name=".cgeotouch" + android:name=".LogTrackableActivity" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation" > </activity> |