Merge branch 'master' into openmp-step4
Resolved Conflicts:
doc/Section_commands.txt
doc/pair_lj.txt
src/OPT/pair_lj_cut_coul_long_tip4p_opt.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Oct 1 2011, 15:06 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS1a03c618c3ed: minor cleanup
rLAMMPSa2fc91f4a758: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7026 f3b2605a-c512-4ea7… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| a2fc91f4a758 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7026 f3b2605a-c512-4ea7… | Sep 30 2011 | |||
| 0df8da2f7177 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7025 f3b2605a-c512-4ea7… | Sep 30 2011 | |||
| f7f353f8cf1d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7024 f3b2605a-c512-4ea7… | Sep 30 2011 | |||
| a352cb0ed641 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7022 f3b2605a-c512-4ea7… | Sep 30 2011 | |||
| 79e10871461a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7021 f3b2605a-c512-4ea7… | Sep 30 2011 | |||
| dd35394165d7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7020 f3b2605a-c512-4ea7… | Sep 30 2011 | |||
| 4fb55e497252 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7019 f3b2605a-c512-4ea7… | Sep 30 2011 | |||
| 7d2dd1a90f92 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7018 f3b2605a-c512-4ea7… | Sep 30 2011 | |||
| 4c107e07a44d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7017 f3b2605a-c512-4ea7… | Sep 30 2011 |