Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-OMP/msm_cg_omp.cpp
src/USER-OMP/pppm_disp_tip4p_omp.cpp
src/USER-OMP/pppm_tip4p_omp.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Aug 10 2014, 02:10 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSbe1b3bd0294c: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12295 f3b2605a-c512-4ea7…
rLAMMPS0a782cc31dfb: include faster adapted logarithm - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| be1b3bd0294c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12295 f3b2605a-c512-4ea7… | Aug 9 2014 | |||
| eb0e123dbe93 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12294 f3b2605a-c512-4ea7… | Aug 9 2014 | |||
| 927bf8f9f996 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12293 f3b2605a-c512-4ea7… | Aug 9 2014 | |||
| f75219da7021 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12292 f3b2605a-c512-4ea7… | Aug 9 2014 | |||
| 92a3a2289977 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12288 f3b2605a-c512-4ea7… | Aug 8 2014 | |||
| d62844fa517d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12287 f3b2605a-c512-4ea7… | Aug 8 2014 | |||
| b7e6d76f38a8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12286 f3b2605a-c512-4ea7… | Aug 8 2014 | |||
| c1e12f950867 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12285 f3b2605a-c512-4ea7… | Aug 8 2014 | |||
| 9026afed5cf9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12284 f3b2605a-c512-4ea7… | Aug 8 2014 |
