diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-12-13 19:28:08 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-12-13 19:28:45 +0100 |
| commit | 5ad007ed7938a9b284278b34a77ec21a0061fd86 (patch) | |
| tree | c31f9ab2e2855f571081c86efdfb820ad424c078 /main/src/cgeo | |
| parent | 4069731734e31049f3c2eecad21e0831c394b7d7 (diff) | |
| parent | 516204d3a42145717f3cb4249c824aa81739ec02 (diff) | |
| download | cgeo-5ad007ed7938a9b284278b34a77ec21a0061fd86.zip cgeo-5ad007ed7938a9b284278b34a77ec21a0061fd86.tar.gz cgeo-5ad007ed7938a9b284278b34a77ec21a0061fd86.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/src/cgeo/geocaching/enumerations/LogType.java
Diffstat (limited to 'main/src/cgeo')
| -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 559b27f..9c9fd84 100644 --- a/main/src/cgeo/geocaching/enumerations/LogType.java +++ b/main/src/cgeo/geocaching/enumerations/LogType.java @@ -39,7 +39,7 @@ public enum LogType { ANNOUNCEMENT(74, "74", "announcement", R.string.log_announcement), MOVE_COLLECTION(69, "69", "unused_collection", R.string.log_movecollection), MOVE_INVENTORY(70, "70", "unused_inventory", R.string.log_moveinventory), - RETRACT(25, "25", "rectract listing", R.string.log_retractlisting), + RETRACT(25, "25", "retract listing", R.string.log_retractlisting), UNKNOWN(0, "unknown", "", R.string.err_unknown, R.drawable.mark_red); // LogType not init. yet public final int id; |