]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84f5ea6 21bea14)
Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Mon, 25 Feb 2013 15:47:13 +0000 (16:47 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 25 Feb 2013 15:47:13 +0000 (16:47 +0100)

Trivial merge