]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Tue, 18 Apr 2017 23:11:39 +0000 (01:11 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 18 Apr 2017 23:11:39 +0000 (01:11 +0200)
commit35eff34d3dd4296ca9a9ab553f6d71e76dd9581f
tree453bc097edd697b7b3c38649b518ebd1d884ba24
parent73fa9f23bb4be30b257a4a7fa0e95622aafeb192
parent699a2247a6560c2af0327ad62d41b8a91702ab0c
Merge branch 'master' into terencehill/bot_waypoints