Merge branch 'master' into martin-t/dmgtext2
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 11 May 2017 18:30:11 +0000 (20:30 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 11 May 2017 18:30:11 +0000 (20:30 +0200)
1  2 
qcsrc/client/miscfunctions.qc

Simple merge