Merge branch 'master' into lammps-icms
78bef9c2892c
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 9 2011, 15:26.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 9 2011, 15:26

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS78bef9c2892c: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 9 2011, 15:26

Commit	Author	Details	Committed
f15769257a12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5767 f3b2605a-c512-4ea7…	Mar 8 2011
96a806fb4fa7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5766 f3b2605a-c512-4ea7…	Mar 8 2011
530758f86d7a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5764 f3b2605a-c512-4ea7…	Mar 8 2011
ecc99897164a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5763 f3b2605a-c512-4ea7…	Mar 8 2011
dc7bc78f69c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5762 f3b2605a-c512-4ea7…	Mar 8 2011
22235e782b1a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5761 f3b2605a-c512-4ea7…	Mar 8 2011

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/compute.html
	M			doc/compute.txt
	P			doc/compute_cluster_atom.html Copied from doc/compute_coord_atom.html
	A			doc/compute_cluster_atom.txt
	P			doc/compute_coord_atom.html Copied to doc/compute_cluster_atom.html
	M			doc/compute_coord_atom.txt
	M			src/GRANULAR/atom_vec_granular.cpp
	M			src/GRANULAR/atom_vec_granular.h
	M			src/atom.cpp
	M			src/atom_vec.h
	M			src/atom_vec_hybrid.cpp
	M			src/atom_vec_hybrid.h
	M			src/version.h