Merge branch 'master' into lammps-icms
- Resolved Conflicts:
- doc/Manual.html
- doc/Manual.txt
- doc/pair_hybrid.txt
- doc/pair_reax.html
- doc/pair_reax.txt
- doc/pair_reax_c.txt
- src/MANYBODY/pair_polymorphic.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Dec 11 2015, 13:33 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS3b6a3f4e55c5: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14357 f3b2605a-c512-4ea7…
rLAMMPSb2a75f111c35: transfer updates from angle style dipole to dipole/omp - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 3b6a3f4e55c5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14357 f3b2605a-c512-4ea7… | Dec 10 2015 | |||
| 4c1ad1758176 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14354 f3b2605a-c512-4ea7… | Dec 10 2015 | |||
| d94f71a6a873 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14352 f3b2605a-c512-4ea7… | Dec 10 2015 | |||
| 2cf6305dc1c7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14351 f3b2605a-c512-4ea7… | Dec 10 2015 | |||
| 03a900697933 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14350 f3b2605a-c512-4ea7… | Dec 10 2015 | |||
| 28bf73fbf744 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14349 f3b2605a-c512-4ea7… | Dec 10 2015 | |||
| 8550cacf189b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14348 f3b2605a-c512-4ea7… | Dec 10 2015 | |||
| 86a4507b00c1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14347 f3b2605a-c512-4ea7… | Dec 10 2015 | |||
| 807e00de9333 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14346 f3b2605a-c512-4ea7… | Dec 10 2015 | |||
| 59e5d3667165 | stamoor | Fixing region issue | Dec 10 2015 |