Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 6 Oct 2014 22:58:54 +0000 (18:58 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 6 Oct 2014 22:58:54 +0000 (18:58 -0400)
commit87b9af34d7864044aa70720cfd32bf259750772b
treefc2a9430a963fc575e165872f454165bdbeff143
parent63437aec44747fb9ad0ab6264ae5e4bbf3dc0e5b
parent2624b945cbb1dd92efea28220fb38f5ebaf0b66a
Merge branch '1.4.x'
src/theory/sets/theory_sets_private.cpp
test/regress/regress0/Makefile.am