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)
1  2 
qcsrc/common/t_items.qc
qcsrc/common/t_items.qh

Simple merge
Simple merge