]> 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: 74bd72d 7d13257)
Merge remote-tracking branch 'origin/terencehill/bot_waypoints'
authorterencehill <piuntn@gmail.com>
Sat, 8 Dec 2018 12:25:04 +0000 (13:25 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 8 Dec 2018 12:25:04 +0000 (13:25 +0100)
1  2 
qcsrc/server/bot/api.qh patch | diff1 | diff2 | blob | history
qcsrc/server/bot/default/waypoints.qc patch | diff1 | diff2 | blob | history

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