diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-11-10 09:34:00 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-11-10 09:34:00 +0100 |
| commit | 2fd3060213c74747d76cb104a3ecb693a3352781 (patch) | |
| tree | f4b1b2b1f4b2307cc3788d27ec627b4ce2a44579 /main/.settings | |
| parent | 9ef9950fc27d0099bd4a482a2cf623deea56d4ea (diff) | |
| parent | 653c85552f87a47218330a65642a2a4515255538 (diff) | |
| download | cgeo-2fd3060213c74747d76cb104a3ecb693a3352781.zip cgeo-2fd3060213c74747d76cb104a3ecb693a3352781.tar.gz cgeo-2fd3060213c74747d76cb104a3ecb693a3352781.tar.bz2 | |
Merge remote-tracking branch 'KiwiStone/popularity_filter'
Conflicts:
main/res/values/strings.xml
main/src/cgeo/geocaching/filter/FilterUserInterface.java
Diffstat (limited to 'main/.settings')
0 files changed, 0 insertions, 0 deletions