| commit | b4223f2f2f797fe3a001a7fc0da8f967a86e8f7e | |
| author | Roland Schulz <roland@utk.edu> | |
| Wed, 18 Jun 2014 14:06:23 +0000 (18 10:06 -0400) | ||
| committer | Roland Schulz <roland@utk.edu> | |
| Wed, 18 Jun 2014 14:25:37 +0000 (18 10:25 -0400) | ||
| tree | 8307da779e0a8d124d331cb9c5eb17afa5e2a4aa | treesnapshot (tar.gz zip) |
| parent | 0d1494f496c8da667056fcb07f916f3ea29367d9 | commitdiff |
| parent | 43244544d12d94a8569d167479d14c8d8ac8cd01 | commitdiff |
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
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: