From: Hamed <hamed.gorjiara@gmail.com>
Date: Fri, 25 Aug 2017 05:26:41 +0000 (-0700)
Subject: Merge with branch master ...
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e4a14b6b2b3273cf076e674a68893b05ac62bc73;p=satune.git

Merge with branch master ...
---

e4a14b6b2b3273cf076e674a68893b05ac62bc73
diff --cc src/ASTTransform/integerencoding.cc
index a992f8f,a326233..ff384cb
--- a/src/ASTTransform/integerencoding.cc
+++ b/src/ASTTransform/integerencoding.cc
@@@ -5,8 -5,7 +5,9 @@@
  #include "csolver.h"
  #include "predicate.h"
  #include "element.h"
 +#include "rewriter.h"
 +
+ /*
  void orderIntegerEncodingSATEncoder(SATEncoder *This, BooleanOrder *boolOrder){
  	Order* order = boolOrder->order;
  	if (order->elementTable == NULL) {