Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 22 Jan 2014 19:42:54 +0000 (13:42 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 22 Jan 2014 19:42:54 +0000 (13:42 -0600)
commit6458cf505ef20a881d62794ea2a16c06f0d67acf
tree693cfca9982ce0257fd132e956b32f7f681954db
parentfffb74dbd0ee96b636fb494e843dd760b1a13149
parentaa578ea6e6487c2fffaa72c600e482ef7ce6035d
Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
src/smt/smt_engine.cpp