diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2013-04-07 13:35:30 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2013-04-07 13:46:01 +0200 |
| commit | 29b9c9bcb06cb19f39ead0184b05ae8c96eda9cb (patch) | |
| tree | 97fc1156426c0b623ff0a53de0c4fda8a7c89473 /main/res/values-ja | |
| parent | c1b68d1b4b5d73afe60dcbbe03e9d3fd12f428b0 (diff) | |
| parent | 37c90405dff48b5996fc8103e071fcd9c54f7a21 (diff) | |
| download | cgeo-29b9c9bcb06cb19f39ead0184b05ae8c96eda9cb.zip cgeo-29b9c9bcb06cb19f39ead0184b05ae8c96eda9cb.tar.gz cgeo-29b9c9bcb06cb19f39ead0184b05ae8c96eda9cb.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/src/cgeo/geocaching/export/GpxExport.java
Diffstat (limited to 'main/res/values-ja')
0 files changed, 0 insertions, 0 deletions