projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b31c13c 1a80f55)
Merge branch 'master' into terencehill/race_fix
authorterencehill <piuntn@gmail.com>
Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 22 Mar 2016 19:10:25 +0000 (20:10 +0100)
1  2 
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/mutator/gamemode_assault.qc patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/mutator/gamemode_race.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/g_world.qc
Simple merge