Merge remote branch 'origin/diabolik/glow_erebus_screenie'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:28:04 +0000 (08:28 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:28:04 +0000 (08:28 +0100)
commited52337e1e4aeb2f639e0d2c46273c8a06b1cc13
tree1ae6168b6f6f6f3df6739d4f5b5f3ac8c59835ef
parente1ee96d23a1e8a4ca34125b8b3ed31755d315357
parentce866b6b4c140ac8fc4fb8d63241f89740c423f1
Merge remote branch 'origin/diabolik/glow_erebus_screenie'