]> 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 | compact (merge: a71acae 29cced5)
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
authorMario <mario@smbclan.net>
Mon, 3 Oct 2016 06:54:30 +0000 (16:54 +1000)
committerMario <mario@smbclan.net>
Mon, 3 Oct 2016 06:54:30 +0000 (16:54 +1000)

Trivial merge