Merge branch 'hamed' of ssh://demsky.eecs.uci.edu/home/git/constraint_compiler into...

diff --cc src/AST/boolean.h
index 1f218b2,1b5d24d..de96bfc
--- 1/src/AST/boolean.h
--- 2/src/AST/boolean.h
+++ b/src/AST/boolean.h
@@@ -23,9 -21,9 +23,9 @@@ public
        virtual bool isFalse() {return boolVal == BV_MUSTBEFALSE;}
        Polarity polarity;
        BooleanValue boolVal;
-       Vector<Boolean *> parents;
+       Vector<ASTNode *> parents;
        virtual void updateParents() {}
 -      
 +        uint64_t id;
        CMEMALLOC;
  };
  

diff --cc src/csolver.h
Simple merge