Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 17 Jun 2016 10:30:52 +0000 (12:30 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 17 Jun 2016 10:30:52 +0000 (12:30 +0200)
commit983eae3dc5f94f06952ab6e157558fb8782b7ec4
treefca5b660c60f6b173e88aebf2ad8d5316e93b3ad
parent2ef765a857eaf1ab9352e7e642264742ea5939f1
parent5833198845cd99accfa204cf5725233dbed3ef5b
Merge branch release-5-1 into release-2016

Change-Id: I02dae90bd8dfa2279081bc8547ae447b68b30a76
src/gromacs/listed-forces/disre.cpp
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp