diff options
author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-11-28 11:55:53 (GMT) |
---|---|---|
committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-11-28 11:55:53 (GMT) |
commit | 3fe257916a621b17a20ec9e5ecdd24ef2eb56c3b (patch) | |
tree | 5e3542ba15ab4ec4fec042fdc93839c9b582990c /src/tests/md_openmp_util.c | |
parent | 62283ba4d3a9b6dc3c383d2a6a0dcfacf5dd836f (diff) | |
parent | 6e5722fa810597ce42ff2bd8f28b378fac942842 (diff) |
Merge branch 'master' of git.gromacs.org:tng
Conflicts:
src/lib/tng_io.c
Diffstat (limited to 'src/tests/md_openmp_util.c')
0 files changed, 0 insertions, 0 deletions