Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/REPLICA/prd.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Feb 15 2014, 15:43 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSd47ec9bed1fb: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11568 f3b2605a-c512-4ea7…
rLAMMPS61af28265478: move open_potential() from pair.cpp to force.cpp and extend to bonds/angles - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| d47ec9bed1fb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11568 f3b2605a-c512-4ea7… | Feb 14 2014 | |||
| c68797380a60 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11567 f3b2605a-c512-4ea7… | Feb 14 2014 | |||
| 109b5601d0e8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11566 f3b2605a-c512-4ea7… | Feb 14 2014 | |||
| 4833f14be891 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11565 f3b2605a-c512-4ea7… | Feb 14 2014 | |||
| f3d97892b63d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11564 f3b2605a-c512-4ea7… | Feb 14 2014 |