Merge pull request #86 from Dima73/timer
authorlittlesat <littlesat99@yahoo.com>
Fri, 6 Nov 2015 21:39:02 +0000 (22:39 +0100)
committerlittlesat <littlesat99@yahoo.com>
Fri, 6 Nov 2015 21:39:02 +0000 (22:39 +0100)
commit34e5baa302af1a629eddb6c2047400f3787fee39
tree52fbfd1bfd7459d720e8d51604951663a2eb1ee5
parent003eab966517ee56f3ec53051eac83e4f4dbf500
parent3696324e47a0bfc152591e111eb7314433191204
Merge pull request #86 from Dima73/timer

Add option enable/disable conflict detection for each timer