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)
commit3b3e56d6c0e203d312fd5ee5ec680404c4e9dc2d
tree2778ff98e4b4f7b498be6dd88bc4b46d0675a71e
parentb4f6693f1485b5c56484d5d1f051165a4e320c2f
parent44182002afcc9fdeca93c8296185258d374f6513
Merge branch 'master' into martin-t/dmgtext2
qcsrc/client/miscfunctions.qc