Merge branch 'merge-pull-27' into icms-merge
Resolved Conflicts:
src/Make.py
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Feb 19 2016, 17:00 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS5d1bca0cfc2c: Merge branch 'make-fixes' of https://github.com/twhitehead/lammps into merge…
rLAMMPS38c23402c330: incorporate tersoff/gpu bugfix from trung - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 5d1bca0cfc2c | Axel Kohlmeyer | Merge branch 'make-fixes' of https://github.com/twhitehead/lammps into merge… | Feb 19 2016 | |||
| 8325221000dc | Tyson Whitehead | MAKE: use copy to copy input lists as handles None for us | Feb 18 2016 | |||
| 449a192d1b00 | Tyson Whitehead | MAKE: use capitalize() function instead of doing it manually | Feb 18 2016 | |||
| e4789506c260 | Tyson Whitehead | MAKE: Actions didn't always produce lib, file, clean, exe order | Feb 18 2016 | |||
| fe47afd0c768 | Tyson Whitehead | MAKE: cut and paste error whereby output was Makefile class | Feb 18 2016 | |||
| 3cd652b81fdc | Tyson Whitehead | MAKE: accepted "standard" but didn't affect final package list | Feb 18 2016 |