]> 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: 67640b0 d9ddf45)
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Mon, 22 Oct 2018 15:38:04 +0000 (17:38 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 22 Oct 2018 15:38:04 +0000 (17:38 +0200)
1  2 
qcsrc/server/bot/default/havocbot/havocbot.qc patch | diff1 | diff2 | blob | history
qcsrc/server/bot/default/waypoints.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/bot/default/waypoints.qc
Simple merge