Merge release-4-6 into master
authorRoland Schulz <roland@utk.edu>
Wed, 3 Oct 2012 18:04:41 +0000 (14:04 -0400)
committerRoland Schulz <roland@utk.edu>
Thu, 4 Oct 2012 00:42:11 +0000 (20:42 -0400)
commitca2923a25087804125a663a88ac97bc324ce8742
tree634d44e6c8995cb9a3a97d0926bfd71913e8830e
parent56006661a58a9c8687635e5e39e9cba8372ee745
parent597c9d5a798e0141d5eeaf602a2069b21e335d1a
Merge release-4-6 into master

Conflicts:
src/gromacs/gmxlib/statutil.cpp (trivial)

To avoid unnecessary conflicts I reverted the following
changes from 4.6 before merging:

Because they are backports:
    Fixes for numeric and position selection variables
        caf863c4b51432db29429968c582073fda341865
    Add pdbname selection keyword.
        79f2d06a34715ea2950352a8cbf339423219d7d8.
Because it has to be redone different in master:
    Update use of CPack components and add install targets
        9628e27dcbd51f25d25e39feaef7cb9730bb9f51

Updated cmake/CreateManPage.cmake & cmake/BuildManPages.cmake
for bin location.

Change-Id: I467d75ad1af69712bf0cdddc9d48cd919eebc449
27 files changed:
cmake/BuildManPages.cmake
cmake/CreateManPage.cmake
cmake/gmxSetBuildInformation.cmake
share/html/online/getting_started.html
src/gromacs/gmxlib/confio.c
src/gromacs/gmxlib/copyrite.c
src/gromacs/gmxlib/index.c
src/gromacs/gmxlib/main.c
src/gromacs/gmxlib/pdbio.c
src/gromacs/gmxlib/statutil.cpp
src/gromacs/gmxlib/thread_mpi/barrier.c
src/gromacs/gmxlib/thread_mpi/comm.c
src/gromacs/gmxlib/thread_mpi/impl.h
src/gromacs/gmxlib/thread_mpi/tmpi_init.c
src/gromacs/gmxlib/tpxio.c
src/gromacs/gmxlib/trxio.c
src/gromacs/gmxlib/typedefs.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/legacyheaders/confio.h
src/gromacs/legacyheaders/thread_mpi/barrier.h
src/gromacs/mdlib/constr.c
src/gromacs/mdlib/gmx_wallcycle.c
src/gromacs/selection/sm_insolidangle.cpp
src/programs/mdrun/openmm_wrapper.cpp
src/programs/mdrun/repl_ex.c
src/programs/mdrun/repl_ex.h
src/programs/pdb2gmx/pdb2gmx.c