]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a04b6f 10d0890)
Merge branch 'master' of ssh://git.xonotic.org/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Fri, 31 Dec 2010 17:55:14 +0000 (18:55 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 31 Dec 2010 17:55:14 +0000 (18:55 +0100)

Trivial merge