Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/Make.py
src/REAX/pair_reax.cpp
test/02_commands/in.min-008
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Feb 27 2016, 13:14 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSadbca81654fc: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14691 f3b2605a-c512-4ea7…
rLAMMPSc20d2dccdb0b: update lammps.book for newly added files - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| adbca81654fc | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14691 f3b2605a-c512-4ea7… | Feb 27 2016 | |||
| 94d8894f86e4 | athomps | Added exclusion delete function and bounds check for coord2bin | Feb 27 2016 | |||
| 12d18e27cffd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14689 f3b2605a-c512-4ea7… | Feb 26 2016 | |||
| fe00daa91b40 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14688 f3b2605a-c512-4ea7… | Feb 26 2016 | |||
| 4f50ad2a6a1d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14687 f3b2605a-c512-4ea7… | Feb 26 2016 | |||
| ea6276657576 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14686 f3b2605a-c512-4ea7… | Feb 26 2016 | |||
| b6e19b78037b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14685 f3b2605a-c512-4ea7… | Feb 26 2016 | |||
| 19ca625699aa | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14684 f3b2605a-c512-4ea7… | Feb 26 2016 | |||
| 2a157729a3fb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14683 f3b2605a-c512-4ea7… | Feb 26 2016 |