Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/USER-OMP/pair_nb3b_harmonic_omp.h
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Oct 17 2014, 00:12 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSe2ff85f14ca5: Tweaked attributions
rLAMMPSac3359b2d6d3: update colvars library to the state of 16 Oct 2014 - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| e2ff85f14ca5 | athomps | Tweaked attributions | Oct 14 2014 | |||
| 4a31f062c434 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12635 f3b2605a-c512-4ea7… | Oct 14 2014 |