| commit | 25b514380d87f0f6b6f2348aeb365670f5f955c1 | [log] [tgz] |
|---|---|---|
| author | Kevin <kevin@ccri.com> | Fri Mar 04 10:23:45 2011 -0500 |
| committer | Kevin <kevin@ccri.com> | Fri Mar 04 10:23:45 2011 -0500 |
| tree | 5b55277c16da94a71d1c06866c95edad9a83f789 | |
| parent | 8c29b236e5fe758d3268e885504051f98d6c8ef1 [diff] |
Merge branch 'master' of git://github.com/kungfoo/geohash-java Conflicts: src/main/java/ch/hsr/geohash/GeoHash.java src/test/java/ch/hsr/geohash/GeoHashTest.java