Merge pull request #82 from CVC4/master_for_merge
authorguykatzz <katz911@gmail.com>
Wed, 23 Mar 2016 19:12:10 +0000 (12:12 -0700)
committerguykatzz <katz911@gmail.com>
Wed, 23 Mar 2016 19:12:10 +0000 (12:12 -0700)
commit561cd0f930098501f445dcec12e51c5c1915852a
tree254f392449a03901f7acb7a65e9499193d07ac9a
parent786cd2dd5b1c53f650c891d6dfbf299a62840848
parentaa9aa46b77f048f2865c29e40ed946371fd115ef
Merge pull request #82 from CVC4/master_for_merge

Squash-merge from the proof branch