Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 21 Feb 2014 23:16:38 +0000 (18:16 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 21 Feb 2014 23:16:38 +0000 (18:16 -0500)
commit5ceb5dc2f83d29b27afb578c64a20274fed13c86
tree2479c926dd69592159e5d6ffaf854ef00fb94515
parent891c44c99294a7b6a80b2ad3e0ca0e2502b33a9e
parenta8efcd91a8f7dc107355f347996fb8dd3ba7e74a
Merge branch '1.3.x'
src/theory/uf/theory_uf.cpp