Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 20 Feb 2014 23:03:24 +0000 (17:03 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 20 Feb 2014 23:03:24 +0000 (17:03 -0600)
commit7f0f26da448a22fd111041f1c33194040ef4dc25
treeffd4f2a4de506a791890395233b79ea9b23fd27c
parentfa797d425d7a75711a1dd885be3f97f22e30a7dc
parentb12a68cf8df41e941ca0834006f5a4d68b48c05a
Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
src/theory/strings/theory_strings_preprocess.cpp
src/theory/strings/theory_strings_preprocess.cpp