Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Thu, 30 Jun 2016 19:39:01 +0000 (12:39 -0700)
committerGuy <katz911@gmail.com>
Thu, 30 Jun 2016 19:39:01 +0000 (12:39 -0700)
1  2 
src/proof/theory_proof.cpp

Simple merge