Merge pull request #18 from Dima73/master
authorlittlesat <littlesat99@yahoo.com>
Sat, 8 Aug 2015 13:21:56 +0000 (15:21 +0200)
committerlittlesat <littlesat99@yahoo.com>
Sat, 8 Aug 2015 13:21:56 +0000 (15:21 +0200)
commit4681376a4f2f7023e29e7dd4adca9861ce34b778
tree3748fbc974ef108b902010236069890b7c4e097b
parent8e606dca549d8a09cca2576198adf198f6b25ae0
parent07896d24c92a47c9ef6e9bccd388ef0af4500c01
Merge pull request #18 from Dima73/master

Fix conflict timers (step 1)