Merge branch 'master' into kim-simulator-models

2019-07-21 13:59:48 -05:00
parent 354f4d19fd f4df51763d
commit 03d26f6f6f
240 changed files with 14092 additions and 3317 deletions
--- a/src/input.h
+++ b/src/input.h
@ -56,7 +56,6 @@ class Input : protected Pointers {
  int label_active;            // 0 = no label, 1 = looking for label
  char *labelstr;              // label string being looked for
  int jump_skip;               // 1 if skipping next jump, 0 otherwise
-  int ifthenelse_flag;         // 1 if executing commands inside an if-then-else

  FILE **infiles;              // list of open input files