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

Simple merge