Merge tag 'smtcomp2014-application'
authorMorgan Deters <mdeters@cs.nyu.edu>
Sun, 22 Jun 2014 07:15:36 +0000 (03:15 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sun, 22 Jun 2014 07:15:36 +0000 (03:15 -0400)
commit5f1cb5037e00c842338d5093e4bae6f1fdeacc67
tree73ebb8f36ff337ec51f4877542a0057a33f25d8e
parentcca7d0264c74b88be9c987d3c39e16095a628395
parent933a5122ca26194a557a467a082afdafad917335
Merge tag 'smtcomp2014-application'

Conflicts:
contrib/run-script-smtcomp2014-application
src/main/driver_unified.cpp
src/parser/smt2/Smt2.g