minor fix for merge
minor fix for merge
Merge branch 'master' of github.com:tiliang/CVC4
minor cleanup for merge
minor fix for merge
minor cleanup for merge
Merge branch 'master' of github.com:tiliang/CVC4
escaped characters, having an issue with smt-lib defintion, further repair is needed.
minor fix for merge
minor cleanup for merge
minor fix for merge
escaped characters, having an issue with smt-lib defintion, further repair is needed.
Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
	src/theory/strings/theory_strings.cpp
resolve merge conflicts