projects / cvc5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e83aaa ff739bd)
Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 11 Feb 2014 22:44:23 +0000 (16:44 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 11 Feb 2014 22:44:23 +0000 (16:44 -0600)
Conflicts:
src/theory/strings/theory_strings.cpp


Trivial merge