Homec4science

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 16 2015, 12:18.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
src/compute_chunk_atom.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSdb42ad21a0a5: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 16 2015, 12:18

Merged Changes

CommitAuthorDetailsCommitted
08ce833afd3esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13411 f3b2605a-c512-4ea7… 
Apr 15 2015