projects / cvc5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5970b8 15a15f5)
Merge tag 'smtcomp2014-resubmission'
authorMorgan Deters <mdeters@cs.nyu.edu>
Thu, 26 Jun 2014 05:55:38 +0000 (01:55 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Thu, 26 Jun 2014 05:55:38 +0000 (01:55 -0400)
Conflicts:
src/main/portfolio.cpp


Trivial merge