]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/polytrails
authorMario <mario@smbclan.net>
Sat, 10 Dec 2016 11:53:24 +0000 (21:53 +1000)
committerMario <mario@smbclan.net>
Sat, 10 Dec 2016 11:53:24 +0000 (21:53 +1000)
commit8216df10041fc46e5dceb7a2ca5816f70349e9a5
treeb550210793d723f311fc393af70d45a238d5ae1b
parentce8ca59783a3ca959ff1f1f40eb14f6a99c2b994
parentb4fbbbce9f643f769b92c35bc3185f31f53d80bc
Merge branch 'master' into TimePath/polytrails

# Conflicts:
# qcsrc/client/progs.src
# qcsrc/common/physics.qc
# qcsrc/lib/Math.qh
qcsrc/client/mutators/_mod.inc
qcsrc/client/mutators/mutator/_mod.inc
qcsrc/client/mutators/mutator/_mod.qh
qcsrc/client/mutators/mutator/polytrails.qc
qcsrc/lib/math.qh