Homec4science

Merge branch 'master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 10 2011, 16:06.

Description

Merge branch 'master' into lammps-icms

Conflicts resolved in:
doc/Section_commands.html
src/USER-IMD/fix_imd.cpp
src/finish.cpp

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Jan 10 2011, 16:06
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPSdff863f9d370: Changed to MPI_LONG_LONG
rLAMMPSbb93fa20251d: make the code compile again.
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa47e493dfdb2: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 10 2011, 16:06

Merged Changes

CommitAuthorDetailsCommitted
dff863f9d370athomps
Changed to MPI_LONG_LONG 
Jan 8 2011
0bc9255821a9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5511 f3b2605a-c512-4ea7… 
Jan 7 2011
9c2137ef5157sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5510 f3b2605a-c512-4ea7… 
Jan 7 2011
d30e0f0e5f39sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5508 f3b2605a-c512-4ea7… 
Jan 7 2011
f63c616ed121sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5507 f3b2605a-c512-4ea7… 
Jan 7 2011
86ed0949f73asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5506 f3b2605a-c512-4ea7… 
Jan 7 2011
66f56f982c06sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5505 f3b2605a-c512-4ea7… 
Jan 7 2011
140cdf94854fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5504 f3b2605a-c512-4ea7… 
Jan 7 2011
beabb5e05ab1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5503 f3b2605a-c512-4ea7… 
Jan 7 2011
15c856bcaa10sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5502 f3b2605a-c512-4ea7… 
Jan 7 2011