]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a6b93c f9c0c1c)
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Mon, 24 Sep 2012 11:45:14 +0000 (13:45 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 24 Sep 2012 11:45:14 +0000 (13:45 +0200)

Trivial merge