]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/globals' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:32:58 +0000 (20:32 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:32:58 +0000 (20:32 +0200)
commit7d88bb1f7aa947932d346fcdcb6ab3baa8d33bf2
treee46666934cb73d5d287d57be8ce86a60f245faa0
parentb63195011e7818effa58e2bf29747660487236b9
parent8e69041898af22d651b6416745431cbaab84b0d5
Merge branch 'martin-t/globals' into martin-t/master2
qcsrc/server/weapons/tracing.qc