Merge branch 'merge-pull-86' into lammps-icms
This includes some tweaks for the USER-DPD neighborlist processing
and also whitespace cleanups and marking headers as C++ for editors
that recognize emacs mode markers.
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jun 10 2016, 02:26 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS95b5b4de6a4b: add emacs c++ mode markers
rLAMMPSc680971b4c77: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 95b5b4de6a4b | Axel Kohlmeyer | add emacs c++ mode markers | Jun 10 2016 | |||
| e8bd43b31ffb | Axel Kohlmeyer | whitespace cleanup for USER-DPD. remove trailing whitespace and replace tabs… | Jun 10 2016 | |||
| b95febfff912 | Tim Mattox | Expand a comment about using prefiltered ghost bins in half_bin_newton_ssa() | Jun 9 2016 | |||
| 15a7a95137be | Tim Mattox | Protect SSA binning with binatomflag which is only false in build_one() | Jun 9 2016 | |||
| 98cf79e61ebb | Tim Mattox | Remove unneeded and unused FixShardlow::setup_pre_force() | Jun 9 2016 |