]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dba1c3b 64a00f8)
Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 19:18:39 +0000 (21:18 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 19:18:39 +0000 (21:18 +0200)

Trivial merge