]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a4b994 710590f)
Merge branch 'master' into samual/weapons
authorRudolf Polzer <divverent@xonotic.org>
Mon, 7 Apr 2014 09:25:08 +0000 (11:25 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 7 Apr 2014 09:25:08 +0000 (11:25 +0200)

Trivial merge