projects / cvc5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c36b44a 0ab1163)
Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 3 Oct 2013 15:53:46 +0000 (10:53 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 3 Oct 2013 15:53:46 +0000 (10:53 -0500)
Conflicts:
src/theory/strings/theory_strings.cpp


Trivial merge