projects / cvc5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 650bb8f 6b96fda)
Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 16 Jan 2014 21:40:01 +0000 (15:40 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 16 Jan 2014 21:40:01 +0000 (15:40 -0600)
Conflicts:
src/printer/smt2/smt2_printer.cpp


Trivial merge