Merge branch 'Peters' into Peters-B
commit203c93525d12db3ce63d66c5a0d7bf7112e2978c
authorkilo aka Gabor Kmetyko <kg.kilo@gmail.com>
Tue, 5 Jul 2011 13:40:02 +0000 (5 15:40 +0200)
committerkilo aka Gabor Kmetyko <kg.kilo@gmail.com>
Tue, 5 Jul 2011 13:40:02 +0000 (5 15:40 +0200)
tree6966c9542ce7c4ae679e1486a10ac2278e3ca2b1
parent85ffa6da7c6f857bb5aaf9641b067480341f364f
parent2c670197af102828a863211ab4ed4a3c8baf5c92
Merge branch 'Peters' into Peters-B

* Peters:
  Seaside terrain elevation fixes.
  Outside terrain elevation fixes.
  Resolved offset conflict.