]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64e7b6d 7c19cc7)
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Wed, 6 Sep 2017 16:36:50 +0000 (18:36 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 6 Sep 2017 16:36:50 +0000 (18:36 +0200)
1  2 
qcsrc/server/command/sv_cmd.qc patch | diff1 | diff2 | blob | history
qcsrc/server/sv_main.qc patch | diff1 | diff2 | blob | history

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