Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 3 Oct 2014 19:15:45 +0000 (15:15 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 3 Oct 2014 19:15:45 +0000 (15:15 -0400)
commit9323af51596eece5107b6ee4f7423ad56c9385b8
tree65675635487223e5e679dd49cf8703ae1752ef19
parent6294adeb83155c54539b2d2d31fa9e3a5b6f1a00
parent65f0dc22fe49c6c388e9413f3b7541d7fb49a3b3
Merge branch '1.4.x'

Conflicts:
NEWS
NEWS
src/expr/command.cpp
src/parser/cvc/Cvc.g
src/printer/cvc/cvc_printer.cpp
src/printer/smt2/smt2_printer.cpp