Resolved merge conflict with upstream.
Description
Description
Details
Details
- Committed
Stefan Paquay <stefanpaquay@gmail.com> May 28 2016, 16:52 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSed8859aced87: Made example legal command.
rLAMMPS8cedc0981394: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 8cedc0981394 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | May 26 2016 | |||
| 4c5763fa8551 | Axel Kohlmeyer | enforce initialization of dynamic member variable and move check for dynamic… | May 26 2016 | |||
| edbb8bc31d8e | athomps | Fixed uninitialized variables | May 25 2016 | |||
| edb8cfcb6a85 | Axel Kohlmeyer | improve check for fix rigid in fix gcmc to flag incompatibility | May 25 2016 | |||
| eecee57de649 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | May 25 2016 | |||
| e78d24a92f4e | Axel Kohlmeyer | compute voronoi/atom requires atom ids. use atom->map_tag_max instead of nall… | May 25 2016 | |||
| 48eefc71e922 | Axel Kohlmeyer | add missing semicolon to html encoded > and < | May 25 2016 | |||
| 1c19abfa3e6a | Axel Kohlmeyer | record the largest available tag for voronoi occupancy so that later added… | May 25 2016 | |||
| 20b0b4ec1893 | Axel Kohlmeyer | correct formatting of examples in voronoi/atom compute docs | May 25 2016 | |||
| d60fbe4c2280 | athomps | Blocked fix rigid | May 25 2016 | |||
| 97b8a30b72c8 | athomps | Blocked fix rigid | May 25 2016 | |||
| bbdd574e6db2 | athomps | Removed some memory leaks is SSA neighbor list | May 25 2016 | |||
| 01a17e803a6e | Axel Kohlmeyer | flag compute msd as incompatible with dynamic groups | May 24 2016 | |||
| b2ce582a4060 | Axel Kohlmeyer | make compute com and gyration compatible with dynamic groups | May 24 2016 | |||
| 3fe7cf47b662 | Axel Kohlmeyer | remove dead code | May 23 2016 |