Merge branch 'master' into lammps-icms
Resolved Conflicts:
lib/meam/Makefile.gfortran
lib/poems/Makefile.g++
lib/reax/Makefile.gfortran
python/lammps.py
src/USER-CUDA/cuda.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Aug 15 2012, 14:38 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSe02a64ecc0b3: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8667 f3b2605a-c512-4ea7…
rLAMMPS01830d476bc0: Merge branch 'master' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| e02a64ecc0b3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8667 f3b2605a-c512-4ea7… | Aug 15 2012 | |||
| bdbaacd8fb3f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8665 f3b2605a-c512-4ea7… | Aug 15 2012 | |||
| 6139908a11e2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8664 f3b2605a-c512-4ea7… | Aug 15 2012 | |||
| c0f36fd0af9a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8663 f3b2605a-c512-4ea7… | Aug 15 2012 | |||
| 7487754a4d4a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8659 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 39818495c5c2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8658 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 617a28d8f434 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8657 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 7f5e8cb8962c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8656 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| dff995a3234a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8655 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 3994c1335314 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8653 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 10d0ca126df8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8652 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| dd51b1a0c86e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8651 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| ee321aabc64c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8650 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 1512b14f9809 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8649 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 7365c2cfe623 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8648 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| f2bade874d39 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8647 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| e19e06952fcc | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8646 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 15a86b4bcdbf | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8645 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 533db036493e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8644 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 1b8aa27fe555 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8643 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 14e3a6e2c9b4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8642 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 77c7d4c7113e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8641 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 5a306adbf4dd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8639 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 5a74d4f88be2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8637 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| a2f01ca5763e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8636 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| e69d5dacc92c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8634 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 9bb3b04ec4d1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8633 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| bd34e152dfa6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8632 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 8df0f9c2e6e5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8631 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| 6f4f134d4db2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8630 f3b2605a-c512-4ea7… | Aug 14 2012 | |||
| c98a5d41496a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8629 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 6618a2a19d6f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8628 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 21e03d8e5c06 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8627 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 6304a8c9bf8a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8626 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 9b2440a0abe7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8625 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 06688bec43ee | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8624 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 6d4575db42d9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8623 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 40061ab6b8d6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8622 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| d615f1191ea9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8621 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 75bdc11ae348 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8618 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 673d3d80180a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8617 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 0ea3d01f099c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8616 f3b2605a-c512-4ea7… | Aug 13 2012 | |||
| 6908ce6e9df0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8615 f3b2605a-c512-4ea7… | Aug 13 2012 |