Merge branch 'master' into lammps-icms
413247d08a53
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 23 2010, 17:25.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 23 2010, 17:25

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS413247d08a53: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 23 2010, 17:25

Commit	Author	Details	Committed
0296aa9e573c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4564 f3b2605a-c512-4ea7…	Aug 21 2010
0bb1e918e7ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4563 f3b2605a-c512-4ea7…	Aug 21 2010
690d8c056157	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4562 f3b2605a-c512-4ea7…	Aug 21 2010
4e772d1a1636	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4561 f3b2605a-c512-4ea7…	Aug 21 2010

				Path
	M			doc/pair_eam.html
	M			doc/pair_eam.txt
	M			src/MANYBODY/pair_eam.cpp
	M			src/MANYBODY/pair_eam.h
	M			src/MANYBODY/pair_eam_alloy.cpp
	M			src/MANYBODY/pair_eam_fs.cpp
	M			src/SHOCK/fix_msst.cpp
	M			src/SHOCK/fix_msst.h