From: Carsten Kutzner <ckutzne@gwdg.de>
Date: Thu, 4 Nov 2010 09:42:45 +0000 (+0100)
Subject: Merge branch 'master' into rotation
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=40df96b42ef273bdde46788f43e792a3885808bf;p=alexxy%2Fgromacs.git

Merge branch 'master' into rotation

Conflicts:
	src/kernel/runner.c
---

40df96b42ef273bdde46788f43e792a3885808bf
diff --cc src/kernel/runner.c
index 94621948f2,aaef7ab0b4..a328fbf75a
--- a/src/kernel/runner.c
+++ b/src/kernel/runner.c
@@@ -52,6 -52,6 +52,7 @@@
  #include "mdrun.h"
  #include "network.h"
  #include "pull.h"
++#include "pull_rotation.h"
  #include "names.h"
  #include "disre.h"
  #include "orires.h"