Merge branch 'master' into improve-include-consistency

# Conflicts: # src/USER-MESO/atom_vec_tdpd.cpp
2019-07-09 14:50:00 -04:00
parent 31e19e0824 691fc357a4
commit 06dcc9e283
610 changed files with 39096 additions and 8292 deletions
--- a/src/input.h
+++ b/src/input.h
@ -53,7 +53,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