Homec4science

Merge branch '2sep-patch' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 3 2015, 12:22.

Description

Merge branch '2sep-patch' into lammps-icms

  1. Conflicts:
  2. src/read_restart.cpp
  3. src/universe.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSda3605120c57: Merge branch '2sep-patch' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 3 2015, 12:22

Merged Changes

CommitAuthorDetailsCommitted
0c517447cfadAxel Kohlmeyer
anticipate 3 Sep 2015 patch 
Sep 2 2015