| commit | 56ef7bb44c07a28a9cbb89ea3189aefb940bd251 | |
| author | Szilard Pall <pszilard@cbr.su.se> | |
| Fri, 7 May 2010 13:52:00 +0000 (7 15:52 +0200) | ||
| committer | Szilard Pall <pszilard@cbr.su.se> | |
| Fri, 7 May 2010 13:52:00 +0000 (7 15:52 +0200) | ||
| tree | 18d79be2e8cc246819d1568f8b10babbf822d30c | treesnapshot (tar.gz zip) |
| parent | a77135d00fe5c029c1cf3e651f549cc5f5e3e9d6 | commitdiff |
| parent | d5c1a3345f954219129201b210ed57b19b0f5580 | commitdiff |
Merge branch 'master' of git@git.gromacs.org:gromacs
Conflicts:
src/kernel/openmm_wrapper.cpp
Conflicts:
src/kernel/openmm_wrapper.cpp
| src/kernel/openmm_wrapper.cpp | diff1 | diff2 | blobhistory |