]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: f269ed4)
Merge branch 'Mario/wepent_experimental' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 4 Jan 2017 07:07:41 +0000 (07:07 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 4 Jan 2017 07:07:41 +0000 (07:07 +0000)
Merge branch Mario/wepent_experimental (XXL merge request)

See merge request !372


No differences found