Merge branch 'ibaned-pair-table-rx-inherit' into USER-DPD_kokkos
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Jan 9 2017, 20:04 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS9807062594dd: Merge branch 'pair-table-rx-inherit' of https://github.com/ibaned/lammps into…
rLAMMPS26d50853e96c: Merge branch 'master' as of patch 6Jan17 into USER-DPD_kokkos - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 9807062594dd | Tim Mattox | Merge branch 'pair-table-rx-inherit' of https://github.com/ibaned/lammps into… | Jan 9 2017 | |||
| 7201f003e577 | Dan Ibanez | move another enum back | Jan 6 2017 | |||
| d8ddef37ed54 | Dan Ibanez | put enum back in .cpp file | Jan 6 2017 | |||
| ad1402562d70 | Dan Ibanez | Revert "move enum to pair.h" | Jan 6 2017 | |||
| 70927d08e734 | Dan Ibanez/Dan Ibanez | remove duplicate enum | Jan 6 2017 | |||
| a1ac2ae9b757 | Dan Ibanez/Dan Ibanez | move enum to pair.h | Jan 6 2017 | |||
| 3941fe9ab748 | Dan Ibanez/Dan Ibanez | fix compilation | Jan 6 2017 | |||
| 318ab9a18506 | Dan Ibanez/Dan Ibanez | trying PairTableRX : public PairTable | Jan 6 2017 |