]> 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: ba7c5c7 3402b47)
Merge branch 'terencehill/wpeditior_command'
authorterencehill <piuntn@gmail.com>
Wed, 5 Sep 2018 19:26:57 +0000 (21:26 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 5 Sep 2018 19:26:57 +0000 (21:26 +0200)
1  2 
qcsrc/server/command/cmd.qc patch | diff1 | diff2 | blob | history
qcsrc/server/impulse.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/command/cmd.qc
Simple merge
diff --cc qcsrc/server/impulse.qc
Simple merge