Merge branch '1.2.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 20 May 2013 23:07:03 +0000 (19:07 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 20 May 2013 23:07:03 +0000 (19:07 -0400)
commit86d625587d37858ea0f28cf608a635eaba271760
treec27c9159aa705ebd71d54dd40d56dc928dd5222b
parentdcda4b10c3dd0dbbfd41203d4bbdaca6990ef0a8
parentf72907de5dc6e3f2edec85b67b0ac987bb0f252a
Merge branch '1.2.x'

Conflicts:
library_versions
src/parser/parser.h
library_versions
src/smt/smt_engine.cpp