]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1185ba6 e062cc1)
Merge remote-tracking branch 'origin/matthiaskrgr/courtfun'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:17:22 +0000 (11:17 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:17:22 +0000 (11:17 +0200)

Trivial merge