]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/ons_updates
authorMario <zacjardine@y7mail.com>
Sun, 23 Aug 2015 10:42:33 +0000 (20:42 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 23 Aug 2015 10:42:33 +0000 (20:42 +1000)
commitbec3232acca8928ca5b4e1ccfdbf1bf874b5697b
tree3179edb0c90251830a74f5f8f3f54111584e1440
parentfef3dfbbb4483533913b4e30f273b9ed9b568ecd
parent51841214cad4da54b91d5f8129bffa8f42c95eea
Merge branch 'master' into Mario/ons_updates

# Conflicts:
# qcsrc/common/mapinfo.qh
qcsrc/common/mapinfo.qh