Merge branch 'master' into lammps-icms
eaf7faf2945f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 11 2012, 21:34.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 11 2012, 21:34

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSeaf7faf2945f: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 11 2012, 21:34

	Commit			Author	Details	Committed
	e883c3c2fab8			athomps	Updated error messages for shock package	Feb 10 2012
	6a8f0f1e5560			athomps	Updated error messages for SHOCk package	Feb 10 2012

				Path
	M			doc/fix_append_atoms.html
	M			doc/fix_append_atoms.txt
	M			doc/fix_wall_piston.html
	M			doc/fix_wall_piston.txt
	M			src/SHOCK/fix_append_atoms.cpp
	M			src/SHOCK/fix_append_atoms.h
	M			src/SHOCK/fix_nphug.cpp
	M			src/SHOCK/fix_nphug.h
	M			src/SHOCK/fix_wall_piston.cpp
	M			src/SHOCK/fix_wall_piston.h