Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/pppm_tip4p_omp.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Feb 12 2013, 14:40 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS0b0bf77f04c3: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9447 f3b2605a-c512-4ea7…
rLAMMPS4ced572e0249: multi-threaded pppm/tip4p. only tested serially, so far - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 0b0bf77f04c3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9447 f3b2605a-c512-4ea7… | Feb 11 2013 | |||
| 5ae53660409f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9445 f3b2605a-c512-4ea7… | Feb 11 2013 | |||
| 15a6e605d2ec | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9444 f3b2605a-c512-4ea7… | Feb 11 2013 | |||
| a8cb638e765b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9443 f3b2605a-c512-4ea7… | Feb 11 2013 | |||
| 59b8846dc5f7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9442 f3b2605a-c512-4ea7… | Feb 11 2013 |