Merge branch '1.2.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 25 Jun 2013 23:53:02 +0000 (19:53 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 25 Jun 2013 23:53:02 +0000 (19:53 -0400)
1  2 
src/smt/smt_engine.cpp

Simple merge