Homec4science

Merge branch 'forward-patch' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 27 2013, 09:09.

Description

Merge branch 'forward-patch' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
src/dump_custom.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS80b07f5abf80: Merge branch 'forward-patch' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 27 2013, 09:09

Merged Changes

CommitAuthorDetailsCommitted
9e131b08ef7aAxel Kohlmeyer
forward port upcoming changes from upstream 
Nov 27 2013