| commit | 1bc2742b70678dcec3c54a0d8ef172d1b87febe0 | |
| author | Paul Merrill <napalminc@gmail.com> | |
| Mon, 30 May 2011 07:55:45 +0000 (30 00:55 -0700) | ||
| committer | Paul Merrill <napalminc@gmail.com> | |
| Mon, 30 May 2011 07:55:45 +0000 (30 00:55 -0700) | ||
| tree | ccf1af7b645b0a6459b0d288931517d57c4ff20e | treesnapshot (tar.gz zip) |
| parent | f43b769367e496f0e70969d95831b902bf1332a8 | commitdiff |
| parent | ef63a7c7089279649295280f91048e7d5c804e8b | commitdiff |
Merge branch 'master' into area-tilegrid
Conflicts:
src/resourcer.h
src/tilematrix.cpp
src/tilematrix.h
Conflicts:
src/resourcer.h
src/tilematrix.cpp
src/tilematrix.h
| src/resourcer.cpp | diff1 | diff2 | blobhistory |
| src/resourcer.h | diff1 | diff2 | blobhistory |