Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 21 Nov 2013 18:39:36 +0000 (12:39 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 21 Nov 2013 18:39:36 +0000 (12:39 -0600)
commit1fd42bf4feb9b23ef5634ad471d8e0cd68d80349
tree146c01939c5ebee4219e73c706d4a4c468dc3974
parentfd10d6f2e4a8927c3cc5fb100fdc0f6e422a221b
parentd87bb8711757c4da4de7a3cb9193769d301b50fd
Merge branch 'master' of github.com:tiliang/CVC4