projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c34ce25 f2a7c3c)
Merge branch 'Mario/killother' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 24 Jun 2016 09:49:42 +0000 (09:49 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 24 Jun 2016 09:49:42 +0000 (09:49 +0000)
Merge branch Mario/killother (XXL merge request)

Purges the global entity "other" from the codebase

See merge request !327

1  2 
qcsrc/client/scoreboard.qc patch | diff1 | diff2 | blob | history
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc patch | diff1 | diff2 | blob | history
qcsrc/common/vehicles/vehicle/raptor.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/scoreboard.qc
Simple merge