]> 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 (from: 7f6f6dd)
Merge branch 'master' into Mario/turrets
authorMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 01:28:40 +0000 (12:28 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 01:28:40 +0000 (12:28 +1100)
Conflicts:
qcsrc/common/command/generic.qc
qcsrc/common/notifications.qh
qcsrc/server/g_damage.qc
qcsrc/server/progs.src
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/units/unit_ewheel.qc
qcsrc/server/tturrets/units/unit_flac.qc
qcsrc/server/tturrets/units/unit_machinegun.qc
qcsrc/server/tturrets/units/unit_walker.qc


No differences found