merge from replay branch
authorMorgan Deters <mdeters@gmail.com>
Sun, 10 Apr 2011 00:44:20 +0000 (00:44 +0000)
committerMorgan Deters <mdeters@gmail.com>
Sun, 10 Apr 2011 00:44:20 +0000 (00:44 +0000)
commit969b144a5f9630d646afdf0ff0a053df38d0ed1a
tree92eb38ad161abfe3af979a86285549168d118c5e
parent8495ee8e7de4a7e472d72cfb20290940c59794e3
merge from replay branch
24 files changed:
COPYING
Makefile
config/build-type
config/cvc4.m4
configure.ac
src/expr/expr_stream.h [new file with mode: 0644]
src/expr/expr_template.h
src/expr/node.h
src/main/interactive_shell.cpp
src/main/interactive_shell.h
src/main/main.cpp
src/parser/parser.cpp
src/parser/parser.h
src/printer/smt2/smt2_printer.cpp
src/prop/cnf_stream.cpp
src/prop/cnf_stream.h
src/prop/minisat/core/Solver.cc
src/prop/sat.cpp
src/prop/sat.h
src/util/configuration.cpp
src/util/configuration.h
src/util/configuration_private.h
src/util/options.cpp
src/util/options.h