Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 30 2016, 13:05.

Description

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

  1. Resolved Conflicts:
  2. src/MAKE/MINE/Makefile.g++

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPScda6306b69e2: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 30 2016, 13:05

Merged Changes

CommitAuthorDetailsCommitted
aaa32cfd8b8bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14799 f3b2605a-c512-4ea7… 
Mar 29 2016