Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
- Resolved Conflict:
- src/compute_orientorder_atom.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Nov 17 2015, 13:13 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS27798d4f4ec5: Updated compute hexorder/atom, added compute orientorder/atom
rLAMMPS94a7abe3d112: Merge branch 'merge-pull-18' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 27798d4f4ec5 | athomps | Updated compute hexorder/atom, added compute orientorder/atom | Nov 17 2015 | |||
| c28bd3c3ff2b | athomps | Updated compute hexorder/atom, added compute orientorder/atom | Nov 16 2015 | |||
| 9dc8102ac4a3 | athomps | Updated compute hexorder/atom, added compute orientorder/atom | Nov 16 2015 |
