]> 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: 5184121 bec3232)
Merge branch 'Mario/ons_updates' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 23 Aug 2015 10:43:54 +0000 (10:43 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 23 Aug 2015 10:43:54 +0000 (10:43 +0000)
Merge branch Mario/ons_updates (L merge request)

Greatly improves the onslaught gamemode

See merge request !195


Trivial merge