Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 16 Jan 2014 21:40:01 +0000 (15:40 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 16 Jan 2014 21:40:01 +0000 (15:40 -0600)
commit7c8b5664f2c7d4b880b49d37a3f86cf9c156e5f2
treef94917dd435a37830922a2348ad28373811fead8
parent650bb8fecf03c2af1da83177c3ad3f6c1b532294
parent6b96fdafc74d4de42fa875c59aec89fbf809ca8d
Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
src/printer/smt2/smt2_printer.cpp