Merge branch 'master' into divVerent/g-23-srgbcolor
authorRudolf Polzer <divverent@alientrap.org>
Sun, 25 Dec 2011 17:51:21 +0000 (18:51 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 25 Dec 2011 17:51:21 +0000 (18:51 +0100)
commit911a18ac90f2ea1795beef0c63885fa8cef841b2
tree80914dd32828c9c8d9b02e34b1be142b237e3111
parent307912463ed4200034a668bf9c3b889ff7941f9e
parentc16a7b4c4a660a6c297a0986be2e4e565529a8a8
Merge branch 'master' into divVerent/g-23-srgbcolor
maps/g-23.map.options