diff options
| author | mucek4 <tomaz@gorenc.org> | 2012-12-12 13:49:34 +0100 |
|---|---|---|
| committer | mucek4 <tomaz@gorenc.org> | 2012-12-12 13:49:34 +0100 |
| commit | 8a4f62ab17c24efd90a1d9fac35af235b36ac221 (patch) | |
| tree | e0f5bf9bbfd3b100b10d921048c1876375eb7af6 /main/src | |
| parent | 6732ecc329c43832acab0dbeb844aec1ca96724a (diff) | |
| parent | 58ff855100a554c1be254012f055ed2a0dc7de39 (diff) | |
| download | cgeo-8a4f62ab17c24efd90a1d9fac35af235b36ac221.zip cgeo-8a4f62ab17c24efd90a1d9fac35af235b36ac221.tar.gz cgeo-8a4f62ab17c24efd90a1d9fac35af235b36ac221.tar.bz2 | |
Merge branch 'release'
Conflicts:
main/res/values/strings.xml
main/src/cgeo/geocaching/enumerations/LogType.java
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/enumerations/LogType.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java index 2fa7716..9c1a6cc 100644 --- a/main/src/cgeo/geocaching/enumerations/LogType.java +++ b/main/src/cgeo/geocaching/enumerations/LogType.java @@ -33,7 +33,7 @@ public enum LogType { UPDATE_COORDINATES(47, "47", "update coordinates", R.string.log_update), DISCOVERED_IT(48, "48", "discovered it", R.string.log_discovered, R.drawable.mark_green), POST_REVIEWER_NOTE(18, "68", "post reviewer note", R.string.log_reviewer), - VISIT(1001, "1001", "visit", R.string.log_tb_visit, R.drawable.mark_green), + VISIT(1001, "75", "visit", R.string.log_tb_visit, R.drawable.mark_green), WEBCAM_PHOTO_TAKEN(11, "11", "webcam photo taken", R.string.log_webcam, R.drawable.mark_green), ANNOUNCEMENT(74, "74", "announcement", R.string.log_announcement), MOVE_COLLECTION(69, "69", "unused_collection", R.string.log_movecollection), |