| commit | 8c29b236e5fe758d3268e885504051f98d6c8ef1 | [log] [tgz] |
|---|---|---|
| author | Kevin <kevin@ccri.com> | Mon Jan 17 13:52:58 2011 -0500 |
| committer | Kevin <kevin@ccri.com> | Mon Jan 17 13:52:58 2011 -0500 |
| tree | d4c61adaa0739bca0955583a814d106ad73b3fb4 | |
| parent | 282e749d637fa3a1d335dbe53a52e99d183d93f1 [diff] | |
| parent | 41a5c57da4d66464566b1a8068e83b54d8b5c0de [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