Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/JPG/improper_distance.jpg
doc/Section_packages.txt
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Feb 17 2016, 13:14 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSa43731758c54: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14652 f3b2605a-c512-4ea7…
rLAMMPSfc16dfa5a6b6: fix typo that broke serial builds on Travis CI - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| a43731758c54 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14652 f3b2605a-c512-4ea7… | Feb 17 2016 | |||
| eee65e309edd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14651 f3b2605a-c512-4ea7… | Feb 17 2016 | |||
| e4f73836553d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14650 f3b2605a-c512-4ea7… | Feb 17 2016 | |||
| 2ad23266fb20 | stamoor | Fixing Kokkos bug | Feb 17 2016 | |||
| 1a1b81cb8f9b | stamoor | Fixing Kokkos bug | Feb 16 2016 | |||
| 7b9802562c10 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14647 f3b2605a-c512-4ea7… | Feb 16 2016 | |||
| 9d6dbdb0f40e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14646 f3b2605a-c512-4ea7… | Feb 16 2016 | |||
| f5e8f73677b5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14645 f3b2605a-c512-4ea7… | Feb 16 2016 |
