Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
- Resolved Conflicts:
- doc/Manual.txt
- doc/fix_nh.txt
- src/create_atoms.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jan 16 2016, 14:09 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSf6f88c2f2804: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14455 f3b2605a-c512-4ea7…
rLAMMPS02884d27131e: remove tri/lj/omp due to data races. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| f6f88c2f2804 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14455 f3b2605a-c512-4ea7… | Jan 15 2016 | |||
| 0d79f78f73b6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14453 f3b2605a-c512-4ea7… | Jan 15 2016 | |||
| b66f1e351e27 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14452 f3b2605a-c512-4ea7… | Jan 15 2016 | |||
| fb0230aed29b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14451 f3b2605a-c512-4ea7… | Jan 15 2016 | |||
| 1174eacfbbd0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14450 f3b2605a-c512-4ea7… | Jan 15 2016 | |||
| 984a1afa7210 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14449 f3b2605a-c512-4ea7… | Jan 15 2016 | |||
| bfa988207ef5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14448 f3b2605a-c512-4ea7… | Jan 15 2016 | |||
| ef6beaad540e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14447 f3b2605a-c512-4ea7… | Jan 15 2016 | |||
| c0779472855e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14446 f3b2605a-c512-4ea7… | Jan 15 2016 |