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)
commit92e4682f1ae3c75548cab4862c929628d03e5dce
tree87c5b09416e4f6b344f02b2d840eac6fe8bb4121
parent8e83aaadc6c7a653d74a7214f4f81e6ac982c3f7
parentff739bd2e4227ec3254226de86df3b39e2fa23a9
Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
src/theory/strings/theory_strings.cpp