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)
commitb823c44b086ce1a9c85b522e986ade2607aca180
tree7a93a9b550e3149479dbe6ba00147f78c40d475d
parentc5970b88e4334146fe142fa1644a2a36049a6448
parent15a15f5c9fa65df13dfb2fe6b3bf3fc3604ddacc
Merge tag 'smtcomp2014-resubmission'

Conflicts:
src/main/portfolio.cpp