Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 8 Feb 2013 00:03:09 +0000 (19:03 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 8 Feb 2013 00:03:09 +0000 (19:03 -0500)
commit4908c52200a80a848dc529cc312aa5418f6d3dee
tree09713f463f0614b70d136d62b0b25256a4c2b053
parenta72276859f0af0f5e800434879eca111d8bf6644
parent63ca7c0a10dcd6b3be42d4d513f842db76733392
Merge branch '1.0.x'

Conflicts:
src/theory/quantifiers/theory_quantifiers.cpp
src/expr/expr_template.h
src/smt/smt_engine.cpp
test/regress/regress0/Makefile.am