Merge branch 'master' into lammps-icms
70e05cef8eaa
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 4 2010, 12:14.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 4 2010, 12:14

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS70e05cef8eaa: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 4 2010, 12:14

Commit	Author	Details	Committed
b3809cbfdf59	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4240 f3b2605a-c512-4ea7…	Jun 4 2010
fa9f5cf98bc6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4239 f3b2605a-c512-4ea7…	Jun 4 2010
06adf7f37955	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4238 f3b2605a-c512-4ea7…	Jun 4 2010
0eeb48a7b32a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4237 f3b2605a-c512-4ea7…	Jun 4 2010
eb80b6a17b23	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4235 f3b2605a-c512-4ea7…	Jun 4 2010
883f7aedc5c6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4234 f3b2605a-c512-4ea7…	Jun 4 2010
6ddb0f6af130	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4233 f3b2605a-c512-4ea7…	Jun 4 2010
a79fb7358492	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4232 f3b2605a-c512-4ea7…	Jun 4 2010
3cafb13abe28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4230 f3b2605a-c512-4ea7…	Jun 3 2010
c43dbd62d0ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4229 f3b2605a-c512-4ea7…	Jun 3 2010
33388e99af42	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4228 f3b2605a-c512-4ea7…	Jun 3 2010
56f4081838db	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4227 f3b2605a-c512-4ea7…	Jun 3 2010

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/compute_displace_atom.html
	M			doc/compute_displace_atom.txt
	M			doc/compute_msd.html
	M			doc/compute_msd.txt
	M			doc/fix.html
	M			doc/fix.txt
	D			doc/fix_store_coord.html
	D			doc/fix_store_coord.txt
	M			doc/fix_store_force.html
	M			doc/fix_store_force.txt
	A			doc/fix_store_state.html
	A			doc/fix_store_state.txt
	M			doc/fix_viscous.html
	M			doc/fix_viscous.txt
	M			examples/prd/in.prd
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/GRANULAR/pair_gran_hooke_history.h
	M			src/KSPACE/pppm.cpp
	M			src/compute_displace_atom.cpp
	M			src/compute_msd.cpp
	P			src/compute_property_atom.cpp Copied to src/fix_store_state.cpp
	D			src/fix_store_coord.cpp
	D			src/fix_store_coord.h
	P			src/fix_store_state.cpp Copied from src/compute_property_atom.cpp
	P			src/fix_store_state.h Copied from src/compute_property_atom.h
	M			src/pair.cpp
	M			src/pair_lj96_cut.cpp
	M			src/version.h