]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/defaults' into martin-t/okc
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Aug 2017 14:18:51 +0000 (16:18 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Aug 2017 14:18:51 +0000 (16:18 +0200)
commit6c3362162e191402de680067e86ced4331550117
tree87383561eec1f2b30b39ea88121236f7fb936686
parentba95a8ca07fb6e6989fbe1f66bc3e20c32e014f3
parentae277921268b84c7b7ee5ab901ce7f0088c07605
Merge branch 'martin-t/defaults' into martin-t/okc
qcsrc/common/t_items.qc
qcsrc/common/t_items.qh