]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Fri, 19 May 2017 21:25:15 +0000 (23:25 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 19 May 2017 21:25:15 +0000 (23:25 +0200)
commite1ffca1bb185fb2dc57c8e1ed043ef09e578863c
tree8dc039d7b509b19ffa1d9a5a5fc19721db02ab40
parent11efba15cc9654acc0fd9b0e24fa0588411572ce
parent030bb4527cc20693d7ac93c65d6e65b607b76a7c
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/server/sv_main.qc