]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25f7a4a 7bdede8)
Merge branch 'terencehill/more_compilation_optimizations'
authorterencehill <piuntn@gmail.com>
Tue, 12 Feb 2019 17:33:04 +0000 (18:33 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 12 Feb 2019 17:33:04 +0000 (18:33 +0100)
1  2 
qcsrc/server/command/sv_cmd.qc patch | diff1 | diff2 | blob | history
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge
diff --cc qcsrc/server/g_damage.qc
Simple merge