Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
authorMart Lubbers <mart@martlubbers.net>
Mon, 6 Mar 2017 18:50:32 +0000 (19:50 +0100)
committerMart Lubbers <mart@martlubbers.net>
Mon, 6 Mar 2017 18:50:32 +0000 (19:50 +0100)
commit9f93ff243f8ba2e1924e70df10978060a3b6f461
tree8e285a78a7678b591d290007dca2bd74b1e654f5
parentff7049a99f7fdd701d49222019df65a9aee8f05a
parent5019b4f7dbeda8679421ec482f40b85eec9ebd72
Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
Devices/mTaskDevice.icl