Merge branch 'merge-pull-19' into lammps-icms
- Resolved Conflicts:
- doc/Manual.txt
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Nov 19 2015, 14:30 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSf20e3f2f861e: Merge branch 'master' of git://github.com/jdevemy/lammps into merge-pull-19
rLAMMPS25432292fbbf: merge of remaining commits from upstream - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| f20e3f2f861e | Axel Kohlmeyer | Merge branch 'master' of git://github.com/jdevemy/lammps into merge-pull-19 | Nov 19 2015 | |||
| 75bbf481f509 | Julien Devemy | Molecular template and bugfix is_reduced | Nov 19 2015 | |||
| 42b88f2fa2b3 | Julien Devemy | compute scalar | Nov 19 2015 | |||
| 9d6c2bfbc4c9 | Julien Devemy | write data bugfix | Nov 19 2015 |