projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7bea76 bac383d)
Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divVerent@alientrap.org>
Tue, 17 Aug 2010 20:04:31 +0000 (22:04 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Tue, 17 Aug 2010 20:04:31 +0000 (22:04 +0200)

Trivial merge