Merge remote-tracking branch 'gerrit/release-4-6'
authorTeemu Murtola <teemu.murtola@gmail.com>
Tue, 24 Jul 2012 04:37:37 +0000 (07:37 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Tue, 24 Jul 2012 04:38:17 +0000 (07:38 +0300)
commit3791fc5e225d5e9e6241aef389a8a3a60a9215bd
treee06d08310b077a20642b1e8e364f4b09a6295422
parent3444f61970de5c9aa5894855c8c4732b850b6737
parent5508bac25d97e1fbad03ed633ee01dfdaa0ea50f
Merge remote-tracking branch 'gerrit/release-4-6'

Conflicts:
    src/gromacs/selection/compiler.cpp (resolved in favor of master)

Change-Id: I4d6696dbac8c2cc4dd9fdd1f3b9601bd1856dff0
19 files changed:
CMakeLists.txt
src/gromacs/gmxlib/gmxfio.c
src/gromacs/gmxlib/libxdrf.c
src/gromacs/gmxlib/maths.c
src/gromacs/gmxlib/sfactor.c
src/gromacs/gmxlib/trxio.c
src/gromacs/gmxpreprocess/pdb2top.c
src/gromacs/legacyheaders/gmxfio.h
src/gromacs/legacyheaders/xdrf.h
src/gromacs/mdlib/domdec_setup.c
src/gromacs/mdlib/forcerec.c
src/gromacs/mdlib/mdebin.c
src/gromacs/mdlib/minimize.c
src/gromacs/mdlib/pull_rotation.c
src/gromacs/mdlib/shakef.c
src/gromacs/mdlib/shellfc.c
src/programs/mdrun/runner.c
src/tools/CMakeLists.txt
src/tools/gmx_hbond.c