Merge branch 'master' of git://github.com/jdevemy/lammps into merge-pull-19
- Resolved Conflicts:
- doc/Manual.html
- doc/Manual.txt
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Nov 19 2015, 14:09 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS75bbf481f509: Molecular template and bugfix is_reduced
rLAMMPSc763fc92fe1c: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 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 | |||
| e3c4db746c45 | sjplimp | '' | Nov 18 2015 | |||
| 61678ee8f253 | sjplimp | '' | Nov 18 2015 | |||
| f496b51d5653 | athomps | Changed the factorial table to static member | Nov 18 2015 | |||
| d7e2bb3a62ac | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14259 f3b2605a-c512-4ea7… | Nov 17 2015 | |||
| 99c4b4cb2236 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14258 f3b2605a-c512-4ea7… | Nov 17 2015 | |||
| 16a90f2bfc24 | sjplimp | '' | Nov 17 2015 | |||
| cd714e67a745 | sjplimp | '' | Nov 17 2015 |