Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Wed, 18 Jun 2014 14:06:23 +0000 (10:06 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 18 Jun 2014 14:25:37 +0000 (10:25 -0400)
commitb4223f2f2f797fe3a001a7fc0da8f967a86e8f7e
tree8307da779e0a8d124d331cb9c5eb17afa5e2a4aa
parent0d1494f496c8da667056fcb07f916f3ea29367d9
parent43244544d12d94a8569d167479d14c8d8ac8cd01
Merge release-5-0 into master

Conflicts:
- src/gromacs/legacyheaders/types/simple.h
  moved changes into src/gromacs/utility/real.h
- src/gromacs/gmxlib/network.c &
  src/gromacs/utility/basenetwork.cpp
  changes to network.c partially applied to itself
  and paritally to basenetwork.
- src/gromacs/legacyheaders/network.h (trivial)
- src/programs/mdrun/md.cpp (trivial)

Change-Id: Iaeae5bcc691a3fa84978ee261ceb4a5d2aeb4f62
27 files changed:
CMakeLists.txt
src/contrib/do_shift.c
src/gromacs/gmxana/gmx_dipoles.cpp
src/gromacs/gmxana/gmx_eneconv.c
src/gromacs/gmxana/gmx_energy.c
src/gromacs/gmxana/gmx_genion.c
src/gromacs/gmxana/gmx_make_ndx.c
src/gromacs/gmxana/gmx_principal.c
src/gromacs/gmxana/gmx_sham.c
src/gromacs/gmxlib/gmx_thread_affinity.c
src/gromacs/gmxlib/network.c
src/gromacs/gmxlib/nrnb.c
src/gromacs/gmxlib/txtdump.c
src/gromacs/gmxlib/viewit.c
src/gromacs/gmxpreprocess/readir.c
src/gromacs/mdlib/forcerec.c
src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_file_generator/nbnxn_kernel_simd_template.c.pre
src/gromacs/mdlib/nbnxn_kernels/simd_4xn/nbnxn_kernel_simd_4xn.c
src/gromacs/mdlib/qm_gaussian.c
src/gromacs/mdlib/qm_orca.c
src/gromacs/utility/basenetwork.cpp
src/gromacs/utility/fatalerror.cpp
src/gromacs/utility/futil.cpp
src/gromacs/utility/real.h
src/programs/mdrun/md.cpp
src/programs/view/logo.cpp
src/programs/view/x11.cpp