Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/USER-REAXC/reaxc_types.h
src/fix_ave_histo.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> May 2 2014, 12:17 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSc8fce1f52552: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11874 f3b2605a-c512-4ea7…
rLAMMPSe33e0f2723b6: make it compatible to using modules - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| c8fce1f52552 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11874 f3b2605a-c512-4ea7… | May 1 2014 | |||
| 7c8c468fbb37 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11871 f3b2605a-c512-4ea7… | May 1 2014 | |||
| b672dd16dbc9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11870 f3b2605a-c512-4ea7… | May 1 2014 | |||
| 4f43e3f854a3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11869 f3b2605a-c512-4ea7… | May 1 2014 | |||
| f22af06e0296 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11861 f3b2605a-c512-4ea7… | May 1 2014 | |||
| 191c90e48e24 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11860 f3b2605a-c512-4ea7… | May 1 2014 |