Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 20 Feb 2014 23:07:24 +0000 (17:07 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 20 Feb 2014 23:07:24 +0000 (17:07 -0600)
commit92286cd639204ac550b516a28e0d28f99ab0be1e
tree85a85b419cb2641f4c57487e741d4d25ac0b0dab
parent7d9b27e880827b8c70c02af9c7b71f37324b62f5
parent7f0f26da448a22fd111041f1c33194040ef4dc25
Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
src/theory/strings/theory_strings_preprocess.cpp