Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/USER-MISC/pair_meam_spline.h
tools/pymol_asphere/src/error.cpp
tools/restart2data.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Feb 4 2012, 19:12 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS6ba1e93f5d0a: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7694 f3b2605a-c512-4ea7…
rLAMMPS8cdd0f3fa6fe: benchmark/test for meam/spline based on eam.shear - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 6ba1e93f5d0a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7694 f3b2605a-c512-4ea7… | Feb 4 2012 | |||
| 8c770f1bed90 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7693 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| 8e891d019425 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7691 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| 4381a1702bef | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7690 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| 64ab68a56198 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7688 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| ddee962c16d3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7687 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| 7fb5f449e413 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7686 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| 301e696b5ecc | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7685 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| cd78615a7b47 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7684 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| c9446b61831d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7683 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| 9b3b8d2f3a11 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7682 f3b2605a-c512-4ea7… | Feb 3 2012 | |||
| b99a70674471 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7680 f3b2605a-c512-4ea7… | Feb 3 2012 |
