Merge branch 'master' into lammps-icms
e7bc1c26758c
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 27 2012, 19:04.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 27 2012, 19:04

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe7bc1c26758c: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 27 2012, 19:04

Commit	Author	Details	Committed
8af0a6a14cd5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8188 f3b2605a-c512-4ea7…	May 26 2012
78f1a06ea606	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8187 f3b2605a-c512-4ea7…	May 25 2012
c27e7ac9897d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8186 f3b2605a-c512-4ea7…	May 25 2012

				Path
	M			doc/pair_gran.html
	M			doc/pair_gran.txt
	M			src/KSPACE/pair_lj_cut_coul_long.cpp
	M			src/KSPACE/pair_lj_cut_coul_long.h
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.h
	M			src/domain.cpp
	M			src/domain.h
	M			src/dump_atom.cpp
	M			src/dump_custom.cpp
	M			src/lattice.cpp
	M			src/lmptype.h
	M			src/modify.h
	M			src/neighbor.cpp
	M			src/update.cpp