From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Tue, 8 Dec 2015 07:45:22 +0000 (+1100)
Subject: Merge branch 'release-5-0' into release-5-1
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=8a663f65d34e0e5369bdc243dae9e684a30062a1;p=alexxy%2Fgromacs.git

Merge branch 'release-5-0' into release-5-1

 Conflicts:
	src/gromacs/mdlib/coupling.cpp

Trivial conflict from removing unused variables in release-5-1, but
adding one in release-5-0, resolved by combining both logical changes.

Change-Id: Ib3e762bec8699465d47cbc364fecb424b23aec11
---

8a663f65d34e0e5369bdc243dae9e684a30062a1
diff --cc src/gromacs/mdlib/coupling.cpp
index d0169dcdc2,9d0ee0886c..d5244e7134
--- a/src/gromacs/mdlib/coupling.cpp
+++ b/src/gromacs/mdlib/coupling.cpp
@@@ -836,7 -822,7 +836,7 @@@ void trotter_update(t_inputrec *ir, gmx
                      t_extmass *MassQ, int **trotter_seqlist, int trotter_seqno)
  {
  
-     int             n, i, d, ngtc, gc = 0;
 -    int             n, i, j, d, ntgrp, ngtc, gc = 0, t;
++    int             n, i, d, ngtc, gc = 0, t;
      t_grp_tcstat   *tcstat;
      t_grpopts      *opts;
      gmx_int64_t     step_eff;