Merge release-4-5-patches into release-4-6
authorBerk Hess <hess@kth.se>
Thu, 26 Apr 2012 15:40:34 +0000 (17:40 +0200)
committerBerk Hess <hess@kth.se>
Thu, 26 Apr 2012 18:23:02 +0000 (20:23 +0200)
commit6b2e8ac3396fc39c263ec922688ff1068f9cbf22
tree53da76ee229344e48ca2e8d81f4e3bba76404c86
parent5df5871125dfe35f1668f0b66e6a675aadf59a09
parent0b2d41f18a24f02ff07843f41376defec74a7aa9
Merge release-4-5-patches into release-4-6

Change-Id: Id1c62a482c6c3467704cc9b657b53f7df493b7ba
19 files changed:
CMakeLists.txt
include/mdrun.h
share/html/online/mdp_opt.html
src/config.h.cmakein
src/gmxlib/checkpoint.c
src/gmxlib/futil.c
src/gmxlib/mshift.c
src/gmxlib/shift_util.c
src/gmxlib/tpxio.c
src/kernel/md.c
src/kernel/mdrun.c
src/kernel/runner.c
src/mdlib/domdec_setup.c
src/mdlib/md_support.c
src/mdlib/shellfc.c
src/mdlib/sim_util.c
src/tools/gmx_editconf.c
src/tools/gmx_membed.c
src/tools/hxprops.c