]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/common/triggers/func/door.qc

Simple merge