Merge branch 'master' into DefaultUser/trigger_cleanup
authorFreddy <schro.sb@gmail.com>
Wed, 7 Mar 2018 13:46:01 +0000 (14:46 +0100)
committerFreddy <schro.sb@gmail.com>
Wed, 7 Mar 2018 13:46:01 +0000 (14:46 +0100)
commit48d21b537ad85a66c05076afde4c33615da868b7
tree2f4d210468c6530e08232fcbea813ec35a52c3d9
parent75edeb6bf721a0e50f1187ce1e80c02cadb46e99
parentceea8405790b1bc1ac91b3c382884ebaeafcbcac
Merge branch 'master' into DefaultUser/trigger_cleanup
qcsrc/common/triggers/triggers.qh