]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4ff5f0 272a29b)
Merge branch 'master' of /var/cache/git/xonotic/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Dec 2011 15:36:07 +0000 (16:36 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Dec 2011 15:36:07 +0000 (16:36 +0100)

Trivial merge