Merge branch 'master' into imd-improvements
2e9e70a5c279
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 24 2010, 04:58.

Description

Merge branch 'master' into imd-improvements

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 24 2010, 04:58

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2e9e70a5c279: Merge branch 'master' into imd-improvements (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 24 2010, 04:58

	Commit			Author	Details	Committed
	4b0729dc5533			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4011 f3b2605a-c512-4ea7…	Apr 16 2010
	84495f6ae09c			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4010 f3b2605a-c512-4ea7…	Apr 16 2010

				Path
	M			src/USER-EWALDN/pair_buck_coul.cpp
	M			src/USER-EWALDN/pair_lj_coul.cpp
	M			src/pair_hybrid.cpp
	M			src/version.h