Merge branch 'master' into lammps-icms
af6cef97bf45
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 20 2012, 19:53.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 20 2012, 19:53

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSaf6cef97bf45: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 20 2012, 19:53

	Commit			Author	Details	Committed
	1235bc0fe767			pscrozi	Updating KSPACE/Install.sh to reflect new MSM files.	Sep 20 2012
	33a6f3c60edc			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8801 f3b2605a-c512-4ea7…	Sep 19 2012

				Path
	M			src/KSPACE/Install.sh
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
	M			src/pair.cpp
	M			src/pair.h