Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
doc/dump.txt
src/.gitignore
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jan 25 2014, 17:19 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSd94ff39c8fee: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11320 f3b2605a-c512-4ea7…
rLAMMPSdc7ac2ad60dd: update USER-PHONON package to be compatible with 64-bit atom tags - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| d94ff39c8fee | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11320 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| cc4f939cbae2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11319 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| 281f90082edd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11318 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| d6ce6d939fde | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11317 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| a4baae328e31 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11316 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| d557e616ad5b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11315 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| fd56a3d416e3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11314 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| 422e202a7fc2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11313 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| 0b4584465b04 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11312 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| 662a6bbcd60e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11311 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| fe888437bd55 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11310 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| 63c730ea7d79 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11309 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| 96919da16453 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11308 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| 98655f672ef9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11307 f3b2605a-c512-4ea7… | Jan 25 2014 | |||
| 418e9cf0bb62 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11306 f3b2605a-c512-4ea7… | Jan 24 2014 | |||
| 48a85cdd9c03 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11305 f3b2605a-c512-4ea7… | Jan 24 2014 |