Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
lib/cuda/Makefile.lammps
src/GPU/fix_gpu.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jul 27 2013, 12:34 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS9e639c529d64: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10458 f3b2605a-c512-4ea7…
rLAMMPS8b6141dad09a: Merge branch 'lammps-icms' of git://git.icms.temple.edu/lammps-icms into lammps… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 9e639c529d64 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10458 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| f59e0be85c70 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10456 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 43154de326ca | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10455 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 53eea6457185 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10454 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| e2354fbd7f5e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10452 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 8835effbfa6f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10451 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| b4608b636ed7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10449 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| e207ab19932a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10439 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 23529a8d6e10 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10438 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 5abaf6942563 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10436 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| cc4ff51a87ad | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10435 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 9b8196cc9508 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10433 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| d54ed85f7516 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10432 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| fa35c123f14a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10431 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 4aecc6eaf0f9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10430 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 0a1c74ef9e1c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10428 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 072ab6417898 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10427 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| c7e503985706 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10425 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 61f0ca1390d4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10424 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| efa18fbd0152 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10423 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 6563ff8b74a2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10422 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 1c078adb8a74 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10421 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| ab39e9a6aec2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10420 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 5a0cd49c328b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10419 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 0e4a0f86095e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10418 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| f086c6d5fbaf | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10417 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| ffe2d1096bba | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10416 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| d65b922bb287 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10415 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 1a4bead19080 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10414 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 560b0fe3565e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10412 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 7f55d54cdf96 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10411 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 9d6ebaff211d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10410 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| b12b9fced98e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10409 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| a019c5cb581a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10408 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 5e1c01f3bdc4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10407 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 0bdf6303cba1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10406 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 7afd7e7d178b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10405 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 0e292ef2c4d4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10404 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 11e2d3862951 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10403 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 6fc75ee1dae8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10402 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 149d43f84cd8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10401 f3b2605a-c512-4ea7… | Jul 26 2013 | |||
| 6238b9014405 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10400 f3b2605a-c512-4ea7… | Jul 26 2013 |
