Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
lib/gpu/lal_coul.cu
lib/gpu/lal_coul_debye.cu
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jul 7 2014, 03:57 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSff01a109a186: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12171 f3b2605a-c512-4ea7…
rLAMMPSa44e538ac67f: transfer changes from upstream to USER-OMP version - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| ff01a109a186 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12171 f3b2605a-c512-4ea7… | Jul 3 2014 | |||
| a4edae13aeda | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12170 f3b2605a-c512-4ea7… | Jul 3 2014 | |||
| b5d89cd7689e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12169 f3b2605a-c512-4ea7… | Jul 2 2014 | |||
| 0553f4af2b94 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12168 f3b2605a-c512-4ea7… | Jul 2 2014 |