Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
- Resolved Conflicts:
- doc/Manual.html
- doc/Manual.txt
- doc/quit.txt
- src/lammps.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Sep 12 2015, 12:30 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS67771a01fb5a: ''
rLAMMPS06e347d0ee36: finally re-enable r-RESPA tests and use is_active() to skip them for USER-OMP - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 67771a01fb5a | sjplimp | '' | Sep 12 2015 | |||
| 79e54786e7d4 | sjplimp | '' | Sep 12 2015 | |||
| 5cbf3cfba5f1 | athomps | Fixed triclinic bug in gcmc and qtype bug atom/swap | Sep 12 2015 | |||
| 0da2e1782b87 | athomps | Fixed triclinic bug in gcmc and qtype bug atom/swap | Sep 12 2015 | |||
| 886e1700986a | athomps | Fixed triclinic bug in gcmc and qtype bug atom/swap | Sep 12 2015 | |||
| 54210d7a9b2f | athomps | Fixed triclinic bug in gcmc and qtype bug atom/swap | Sep 11 2015 | |||
| 66566c56d637 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14033 f3b2605a-c512-4ea7… | Sep 11 2015 | |||
| 41ef5b75a95a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14032 f3b2605a-c512-4ea7… | Sep 11 2015 | |||
| fa8776172b7f | sjplimp | '' | Sep 11 2015 | |||
| bef809becaaf | sjplimp | '' | Sep 11 2015 | |||
| d32cd3cf51ee | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14029 f3b2605a-c512-4ea7… | Sep 11 2015 | |||
| d9d9a2a496f2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14028 f3b2605a-c512-4ea7… | Sep 11 2015 | |||
| 3561a54e47b0 | sjplimp | '' | Sep 11 2015 | |||
| 4035556ffa34 | sjplimp | '' | Sep 11 2015 | |||
| 9effcca0df71 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14025 f3b2605a-c512-4ea7… | Sep 11 2015 |