repositories / mTask.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff7049a 5019b4f)
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)
1  2 
Devices/mTaskDevice.icl patch | diff1 | diff2 | blob | history

diff --cc Devices/mTaskDevice.icl
Simple merge
Repo containing the code for the mTask system (see msc-thesis1617)