Merge remote branch 'origin/tzork/glowplant'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 26 Jan 2011 07:53:18 +0000 (08:53 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 26 Jan 2011 07:53:18 +0000 (08:53 +0100)
commit0f337c6f15e811b77a0009704aa0c1dfb024357b
treeac64c9b23cea43ec91f8dd08f17fd9954f2fc030
parent8632222c0f0e71e9bfa610f134d8ffd596998887
parenta0e1d774a27c56c53789d726010a591a11449cc6
Merge remote branch 'origin/tzork/glowplant'

Conflicts:
maps/glowplant.map (taking over tZork's new versions, throwing away in between changes on master)