]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into Melanosuchus/single_player
authorMattia Basaglia <mattia.basaglia@gmail.com>
Sat, 18 Mar 2017 10:22:39 +0000 (10:22 +0000)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Sat, 18 Mar 2017 10:22:39 +0000 (10:22 +0000)
commit9d2cf3e43ae8d0658f8c771df8fb17d85239f753
tree0e396743243ae2f8348d1b05f1fe9ae307fe6c3b
parent637cfe4d5f9a39b70b26d00fe6ae24cc68886ad4
parent7ce9999429714a463c09593b566f3b5428404d97
Merge remote-tracking branch 'origin/master' into Melanosuchus/single_player
qcsrc/common/turrets/sv_turrets.qc