Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 1 2016, 19:29.

Description

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

  1. Resolved Conflicts:
  2. src/compute_reduce_region.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5ee04e33b1d5: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 1 2016, 19:29

Merged Changes

CommitAuthorDetailsCommitted
bb0e8a114faesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14694 f3b2605a-c512-4ea7… 
Mar 1 2016
b2e792d6ac80athomps
fixed problem with exclusion 
Feb 29 2016
855e8ec7017fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14692 f3b2605a-c512-4ea7… 
Feb 29 2016