Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Sat, 9 Apr 2016 20:05:50 +0000 (13:05 -0700)
committerGuy <katz911@gmail.com>
Sat, 9 Apr 2016 20:05:50 +0000 (13:05 -0700)
1  2 
src/proof/array_proof.cpp
src/proof/array_proof.h

Simple merge
Simple merge