Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
lib/cuda/Makefile.lammps
src/MOLECULE/dihedral_charmm.cpp
src/pair.h
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jun 29 2013, 13:25 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSb05bc24af63e: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10188 f3b2605a-c512-4ea7…
rLAMMPS14419a6fa251: bugfix for building msi2lmp - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| b05bc24af63e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10188 f3b2605a-c512-4ea7… | Jun 29 2013 | |||
| 05f12d0a823e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10187 f3b2605a-c512-4ea7… | Jun 29 2013 | |||
| b6e02421da2a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10186 f3b2605a-c512-4ea7… | Jun 29 2013 | |||
| e1b6faf8edd9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10185 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 9958dfe26751 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10184 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 1f4b523d6b78 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10183 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| ffa72cdd1023 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10182 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 699154de4221 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10181 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| ccf98a2e111c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10180 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 253283ba4e27 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10179 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| a5468f1bce05 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10178 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| fe83b0a86bf6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10176 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 20c2e35c8f38 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10175 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 191b83cd928f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10174 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 916c06cdbcdb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10173 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 81005917e473 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10172 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| d9fc13e4b397 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10171 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 49a8be89f74b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10170 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 6efd2bf08d7d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10169 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 3428df4c4b90 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10167 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 1cda7f63aaa0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10166 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| bfbe995a9cc0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10165 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| f1fec72c7134 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10164 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| c1691cc761f6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10163 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 47df28ce06a4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10162 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| f37ae6cb7476 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10161 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| aa33af4032e2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10160 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| fcc992d386f6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10159 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| b8ad8ac7e2ab | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10158 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 31b1e0b4bfb2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10156 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| bb17f939ec86 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10155 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 6ce870afe3db | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10154 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 6812ed702d91 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10153 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 7a2e9ccd2c57 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10152 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 679940817c5b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10151 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 737e5e6c3dfd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10150 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 388c4d9cd600 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10149 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| dc119da5855c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10148 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| 86cba5d3b2e6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10145 f3b2605a-c512-4ea7… | Jun 28 2013 | |||
| e069e901d0f2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10144 f3b2605a-c512-4ea7… | Jun 28 2013 |
