Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Sun, 15 Dec 2013 17:49:17 +0000 (11:49 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Sun, 15 Dec 2013 17:49:17 +0000 (11:49 -0600)
commitd57e92d7abf39a242db75c28183ffecf2952287d
treebff6b8bde72065cd21c36bb463cc33b04b90afba
parent97e85b3666e4a8ce15545ec7b3a55b71772d866e
parentf648721c2d44b866a2406c5464870a209ae8728d
Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
NEWS
NEWS