]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
Merge branch 'master' into divVerent/pangofix-public
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Nov 2010 15:29:54 +0000 (16:29 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Nov 2010 15:29:54 +0000 (16:29 +0100)

Trivial merge