Merge remote-tracking branch 'origin/1.4.x'
authorKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 10 Oct 2014 22:08:56 +0000 (18:08 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Fri, 10 Oct 2014 22:08:56 +0000 (18:08 -0400)
1  2 
src/theory/sets/theory_sets_private.cpp
test/regress/regress0/Makefile.am

index 89b620655730ca41482d4187093cb38da5462c91,c0ee0f2bb6d3e3d443a14a1d32a23dac0ff43db1..e7b8e3b737962988193d0f8c60bb667649ef0c91
@@@ -105,8 -105,10 +105,9 @@@ CVC_TESTS = 
        wiki.19.cvc \
        wiki.20.cvc \
        wiki.21.cvc \
 -      simplification_bug3.cvc \
        queries0.cvc \
-       print_lambda.cvc
+       print_lambda.cvc \
+       trim.cvc
  
  # Regression tests for TPTP inputs
  TPTP_TESTS =