after merge (mostly tabbing issues)

diff --cc src/ASTTransform/elementopt.cc
index 25de874bf70a4f08e5c4034bd891e10cb63c2663,6fec15597d29f84d21b7cef38130ee7467eca364..44773795c965a180014fdcae8a0788974cecb7dc
mode 100755,100644..100644
--- 1/src/ASTTransform/elementopt.cc
--- 2/src/ASTTransform/elementopt.cc
+++ b/src/ASTTransform/elementopt.cc

diff --cc src/Tuner/autotuner.cc
Simple merge

diff --cc src/Tuner/tunable.cc
index e7c2d33cd77adbc3ad4f110281f0a203b348637e,6a74926901adb287d4f9893fc3a7f24f2d5c547c..a06d0f1290b888bcb0a167b86a2961a2c7ec1f21
--- 1/src/Tuner/tunable.cc
--- 2/src/Tuner/tunable.cc
+++ b/src/Tuner/tunable.cc
@@@ -15,35 -15,29 +15,35 @@@ int DefaultTuner::getVarTunable(VarTyp
        return descriptor->defaultValue;
  }
  
 -const char *tunableParameterToString(Tunables tunable) {
 -      switch (tunable) {
 -      case DECOMPOSEORDER:
 -              return "DECOMPOSEORDER";
 -      case MUSTREACHGLOBAL:
 -              return "MUSTREACHGLOBAL";
 -      case MUSTREACHLOCAL:
 -              return "MUSTREACHLOCAL";
 -      case MUSTREACHPRUNE:
 -              return "MUSTREACHPRUNE";
 -      case OPTIMIZEORDERSTRUCTURE:
 -              return "OPTIMIZEORDERSTRUCTURE";
 -      case ORDERINTEGERENCODING:
 -              return "ORDERINTEGERENCODING";
 -      case PREPROCESS:
 -              return "PREPROCESS";
 -      case NODEENCODING:
 -              return "NODEENCODING";
 -      case EDGEENCODING:
 -              return "EDGEENCODING";
 -      case MUSTEDGEPRUNE:
 -              return "MUSTEDGEPRUNE";
 -      default:
 -              ASSERT(0);
 -      }
 -}
 +const char* tunableParameterToString(Tunables tunable){
 +        switch(tunable){
 +                case DECOMPOSEORDER:
 +                        return "DECOMPOSEORDER";
 +                case MUSTREACHGLOBAL:
 +                        return "MUSTREACHGLOBAL";
 +                case MUSTREACHLOCAL:
 +                        return "MUSTREACHLOCAL";
 +                case MUSTREACHPRUNE:
 +                        return "MUSTREACHPRUNE";
 +                case OPTIMIZEORDERSTRUCTURE:
 +                        return "OPTIMIZEORDERSTRUCTURE";
 +                case ORDERINTEGERENCODING:
 +                        return "ORDERINTEGERENCODING";
 +                case PREPROCESS:
 +                        return "PREPROCESS";
 +                case NODEENCODING:
 +                        return "NODEENCODING";
 +                case EDGEENCODING:
 +                        return "EDGEENCODING";
 +                case MUSTEDGEPRUNE:
 +                        return "MUSTEDGEPRUNE";
 +              case ELEMENTOPT: 
 +                      return "ELEMENTOPT";
 +              case ELEMENTOPTSETS:
 +                      return "ELEMENTOPTSETS";
 +              case PROXYVARIABLE:
 +                      return "PROXYVARIABLE";
 +                default:
 +                        ASSERT(0);
 +        }
- }
++}