Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/pair_tip4p_cut_omp.cpp
src/USER-OMP/pair_tip4p_long_omp.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jul 30 2013, 17:57 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS424c14b992f3: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10482 f3b2605a-c512-4ea7…
rLAMMPSdedb247fcdf9: anticipate patches from upstream to 12 Aug 2013 version - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 424c14b992f3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10482 f3b2605a-c512-4ea7… | Jul 30 2013 | |||
| 42da25aa6bca | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10481 f3b2605a-c512-4ea7… | Jul 30 2013 | |||
| 378ade817c00 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10480 f3b2605a-c512-4ea7… | Jul 30 2013 | |||
| d8b1c15247fd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10479 f3b2605a-c512-4ea7… | Jul 30 2013 | |||
| 641726ecd753 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10478 f3b2605a-c512-4ea7… | Jul 30 2013 | |||
| 883553303ef5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10477 f3b2605a-c512-4ea7… | Jul 30 2013 | |||
| 936efd215ec2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10474 f3b2605a-c512-4ea7… | Jul 29 2013 | |||
| 314c3cfe92df | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10473 f3b2605a-c512-4ea7… | Jul 29 2013 | |||
| 4d4622ab179c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10472 f3b2605a-c512-4ea7… | Jul 29 2013 | |||
| 3445e262ad54 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10469 f3b2605a-c512-4ea7… | Jul 29 2013 | |||
| 059c406b2067 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10468 f3b2605a-c512-4ea7… | Jul 29 2013 | |||
| a2367f3cbab1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10466 f3b2605a-c512-4ea7… | Jul 29 2013 | |||
| 33b91864aa88 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10465 f3b2605a-c512-4ea7… | Jul 29 2013 | |||
| 6121f426d3cb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10461 f3b2605a-c512-4ea7… | Jul 29 2013 | |||
| 137702f4712f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10459 f3b2605a-c512-4ea7… | Jul 29 2013 |