Merge branch 'master' into lammps-icms
Resolved Conflicts:
lib/gpu/Nvidia.makefile
lib/gpu/Opencl.makefile
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jan 26 2012, 20:57 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS2aaf4f6d7e96: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7581 f3b2605a-c512-4ea7…
rLAMMPS5f7e3909e7b8: proper resize of nmax based arrays. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 2aaf4f6d7e96 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7581 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
| 4f7ae6ff9dbf | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7580 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
| 5df60ac13168 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7579 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
| 79e0fea7f531 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7577 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
| 6d3c7dc10d83 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7576 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
| 6b1774dc2052 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7575 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
| 5c71961c392a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7574 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
| 6e48e4e6dbe1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7573 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
| 53f0f2130c1b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7572 f3b2605a-c512-4ea7… | Jan 25 2012 |
