diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2013-10-24 18:13:11 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2013-10-24 18:13:11 +0200 |
| commit | 115ae0124bd995aefcd1286cd3bdbd64afd88412 (patch) | |
| tree | b33e9be706fd0b52d6df59a3cb8fe539a7ac25d2 /send2cgeo | |
| parent | 03c915c0b432f39cfacb3915bb077b40202ee0ab (diff) | |
| parent | 6803fe2959d8e2bb13a2bfbe591c6be637fda2e7 (diff) | |
| download | cgeo-115ae0124bd995aefcd1286cd3bdbd64afd88412.zip cgeo-115ae0124bd995aefcd1286cd3bdbd64afd88412.tar.gz cgeo-115ae0124bd995aefcd1286cd3bdbd64afd88412.tar.bz2 | |
Merge remote-tracking branch 'origin/release'
Conflicts:
tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
Diffstat (limited to 'send2cgeo')
| -rw-r--r--[l---------] | send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js b/send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js index 1e1f91e..1e1f91e 120000..100644 --- a/send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js +++ b/send2cgeo/firefox-addon/send2cgeo/data/send2cgeo.user.js |