Merge remote-tracking branch 'origin/lurd'
authorMart Lubbers <mart@martlubbers.net>
Wed, 20 Apr 2016 18:20:56 +0000 (20:20 +0200)
committerMart Lubbers <mart@martlubbers.net>
Wed, 20 Apr 2016 18:20:56 +0000 (20:20 +0200)
commit6d27f2cbfee60299b29e28167962574d09851d34
tree61d9ab45a8b53c4d56361446b66c0db3790db2e1
parent666bb0db458df801f433de1b3f3a79921e8bc263
parent7b36d26b43604aa30cd19f6d5345a9d881aff000
Merge remote-tracking branch 'origin/lurd'

Conflicts:
modelchecker/main.c
modelchecker/benchmark.sh
modelchecker/main.c