diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2011-10-25 00:29:34 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2011-10-25 00:29:34 +0200 |
| commit | 83ba46de1e195e8c93452b237df4855cfa76ae69 (patch) | |
| tree | a62ab624e07c844c6690237b51c625795c854fbf /tests/src | |
| parent | c165e77c4975ca58a211f29b09c209f6eeea1a1b (diff) | |
| parent | a66a4bb132080908087a233dd6991f2df1b2640f (diff) | |
| download | cgeo-83ba46de1e195e8c93452b237df4855cfa76ae69.zip cgeo-83ba46de1e195e8c93452b237df4855cfa76ae69.tar.gz cgeo-83ba46de1e195e8c93452b237df4855cfa76ae69.tar.bz2 | |
Merge branch 'issue629' of git://github.com/blafoo/c-geo-opensource
Conflicts:
main/src/cgeo/geocaching/Settings.java
main/src/cgeo/geocaching/cgBase.java
Diffstat (limited to 'tests/src')
0 files changed, 0 insertions, 0 deletions