Merge branch 'master' of https://github.com/CVC4/CVC4
authorClark Barrett <clarkbarrett@google.com>
Tue, 28 Apr 2015 01:23:54 +0000 (18:23 -0700)
committerClark Barrett <clarkbarrett@google.com>
Tue, 28 Apr 2015 01:23:54 +0000 (18:23 -0700)
commit1261597c32e3c8a98225a91fdd7b420867f89329
tree9d8be67f09a2f998b54ee8689020c7d288882e18
parent91cd90ae485a159799d82f7341438a4e9a12a72d
parent721cbfad7ebe3668e87679f65e7ce80251878dc6
Merge branch 'master' of https://github.com/CVC4/CVC4