]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f059eb c563996)
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