Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop

Conflicts: fourmess.c
2016-01-29 08:53:00 +01:00
parent a630a30294 5e597e2d10
commit 95988f331c
50 changed files with 183 additions and 201 deletions
--- a/devexec.c
+++ b/devexec.c
@ -496,7 +496,7 @@ int StopExe(pExeList self, char *name)
  assert(self);

  /* if not active, nothing to do */
-  if ((self->pOwner == NULL) ) {
+  if (self->pOwner == NULL ) {
    self->iRun = 0;
    return 1;
  }