]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/uncrustify
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 16 Oct 2017 07:53:33 +0000 (09:53 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 16 Oct 2017 07:53:33 +0000 (09:53 +0200)
commit15554b3613348748a56d3fbd9e89fef658fb9c1a
treed743480d66ed999ca4b8a573ad533e438a396f9b
parent303fc6b5d70cc1d3f5802b0fdd475692266e0805
parentb033eeb472dde42a24c46120ea2db8591ef5213c
Merge branch 'master' into martin-t/uncrustify
qcsrc/common/triggers/func/door.qc