]> 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: 9c3378b 6b3f7d6)
Merge branch 'terencehill/bot_waypoints' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Tue, 17 Oct 2017 23:24:18 +0000 (01:24 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 17 Oct 2017 23:24:18 +0000 (01:24 +0200)
1  2 
defaultServer.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/bot/default/navigation.qh patch | diff1 | diff2 | blob | history

diff --cc defaultServer.cfg
Simple merge