Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 27 Mar 2014 22:21:01 +0000 (17:21 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 27 Mar 2014 22:21:01 +0000 (17:21 -0500)
commit005f46c18a40dd83dc8e042bfe2725c4b0a566d3
tree2887c446241258700681dd7280b31c6a53e18834
parent70a7ae4dc962e43c38cec19a5549673a46045d71
parentf814750622a50835d4be99b1ced54af5e25d8ed4
Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
src/theory/strings/regexp_operation.cpp
src/theory/strings/regexp_operation.h
src/theory/strings/regexp_operation.cpp