Merge branch 'release-4-5-patches'
authorMaarten Wolf <mwolf@mwolf.mpibpc.intern>
Thu, 10 Mar 2011 14:34:29 +0000 (15:34 +0100)
committerMaarten Wolf <mwolf@mwolf.mpibpc.intern>
Thu, 10 Mar 2011 14:34:29 +0000 (15:34 +0100)
commit23bdb9c697021728d912e214ecfbf79c567020ab
treea6e3ae22f92bfbdd67619c8f18811870d1017f03
parent6207afb9a92f026b0ffc8687b1a0e8ada6e462e7
parentffd3fda976ff2de3a5bd5f2e67d84ce8c607fadf
Merge branch 'release-4-5-patches'

Conflicts:
src/gromacs/libgromacs.pc.cmakein
src/kernel/libgmxpreprocess.pc.cmakein
src/mdlib/libmd.pc.cmakein
src/tools/Makefile.am
src/tools/gmx_membed.c
src/tools/libgmxana.pc.cmakein
15 files changed:
CMakeLists.txt
src/gromacs/gmxlib/checkpoint.c
src/gromacs/gmxlib/futil.c
src/gromacs/gmxlib/main.c
src/gromacs/gmxlib/pdbio.c
src/gromacs/gmxlib/replace.c
src/gromacs/gmxlib/wman.c
src/gromacs/mdlib/edsam.c
src/gromacs/mdlib/mdatom.c
src/gromacs/mdlib/mdebin.c
src/gromacs/mdlib/shellfc.c
src/gromacs/mdlib/sim_util.c
src/programs/grompp/grompp.c
src/programs/mdrun/md.c
src/tools/gmx_tune_pme.c