Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Mon, 1 Oct 2012 13:20:00 +0000 (09:20 -0400)
committerRoland Schulz <roland@utk.edu>
Mon, 1 Oct 2012 13:20:00 +0000 (09:20 -0400)
commit597c9d5a798e0141d5eeaf602a2069b21e335d1a
treea47c1408b9055a99fbf74ed790a71add5385fc34
parentc42f47a2dd0af73d6fffd849a788d4abaf6bf504
parent4280bcc37f312b23f4c2ef06f5b4f47658b3ca5a
Merge release-4-5-patches into release-4-6

Conflicts:
src/gmxlib/confio.c
src/gmxlib/copyrite.c
src/gmxlib/statutil.c
src/kernel/readir.c
src/kernel/repl_ex.c
src/kernel/runner.c

Change-Id: I3828c50f8166a6095ee64672cfd4380d3e4c86f6
20 files changed:
share/html/online/mdp_opt.html
src/gmxlib/confio.c
src/gmxlib/copyrite.c
src/gmxlib/index.c
src/gmxlib/pdbio.c
src/gmxlib/selection/compiler.c
src/gmxlib/selection/evaluate.c
src/gmxlib/selection/selmethod.c
src/gmxlib/selection/sm_insolidangle.c
src/gmxlib/statutil.c
src/gmxlib/trxio.c
src/gmxlib/typedefs.c
src/kernel/openmm_wrapper.cpp
src/kernel/pdb2gmx.c
src/kernel/readir.c
src/kernel/repl_ex.c
src/kernel/repl_ex.h
src/mdlib/constr.c
src/mdlib/gmx_wallcycle.c
src/tools/gmx_dist.c