Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Oct 10 2014, 13:22 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSaf3992fb05d3: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12628 f3b2605a-c512-4ea7…
rLAMMPS635b5096dcc2: adapt energy calculation for pppm/gpu to dynamic charges - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| af3992fb05d3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12628 f3b2605a-c512-4ea7… | Oct 9 2014 | |||
| 12fe6c9415c0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12627 f3b2605a-c512-4ea7… | Oct 9 2014 | |||
| 6efe4bc1a2e4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12626 f3b2605a-c512-4ea7… | Oct 9 2014 |