projects / cvc5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fffb74d aa578ea)
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)
Conflicts:
src/smt/smt_engine.cpp


Trivial merge