Merge remote-tracking branch 'origin/release-4-6'
authorRoland Schulz <roland@utk.edu>
Fri, 18 May 2012 01:00:16 +0000 (21:00 -0400)
committerRoland Schulz <roland@utk.edu>
Fri, 18 May 2012 01:15:48 +0000 (21:15 -0400)
commit1698224bd6251c2b0ece0fd375c0c095ce5eddb8
treea3d8ac44ddcf7082e232c687541295736ffb6cf5
parentdc5410759b6f99d2b55ff85cacf61b84d989cc67
parent813f7e1bf952ad95c03f93e560cba4005bdad86e
Merge remote-tracking branch 'origin/release-4-6'

Conflicts:
include/membed.h
src/gromacs/legacyheaders/membed.h
src/kernel/membed.h

All 3 conflicts old names. Renamed to src/programs/mdrun/membed.h
with content of src/kernel/membed.h from 4.6

Change-Id: I64654ce18162fa7887f17a7c565bc5783c3a1238
20 files changed:
src/gromacs/gmxlib/do_fit.c
src/gromacs/gmxlib/index.c
src/gromacs/gmxlib/oenv.c
src/gromacs/gmxlib/string2.c
src/gromacs/legacyheaders/mdrun.h
src/gromacs/legacyheaders/typedefs.h
src/gromacs/legacyheaders/types/membedt.h
src/gromacs/mdlib/clincs.c
src/gromacs/mdlib/coupling.c
src/gromacs/mdlib/domdec_con.c
src/gromacs/mdlib/domdec_setup.c
src/gromacs/mdlib/force.c
src/gromacs/mdlib/minimize.c
src/gromacs/mdlib/tpi.c
src/programs/mdrun/md.c
src/programs/mdrun/md_openmm.c
src/programs/mdrun/md_openmm.h
src/programs/mdrun/membed.c
src/programs/mdrun/membed.h
src/programs/mdrun/runner.c