Merge branch 'master' into lammps-icms
049c863a9a84
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 26 2010, 23:54.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 26 2010, 23:54

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS049c863a9a84: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 26 2010, 23:54

Commit	Author	Details	Committed
74dc9c26f528	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4596 f3b2605a-c512-4ea7…	Aug 25 2010
fcf30683259f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4594 f3b2605a-c512-4ea7…	Aug 25 2010
957abb3a9502	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4593 f3b2605a-c512-4ea7…	Aug 25 2010
ec71e67a9fa6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4591 f3b2605a-c512-4ea7…	Aug 25 2010
a0122cd328f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4590 f3b2605a-c512-4ea7…	Aug 25 2010
a5f54fa1e27c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4589 f3b2605a-c512-4ea7…	Aug 25 2010
02adb677158a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4588 f3b2605a-c512-4ea7…	Aug 25 2010
ff9d3b9578b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4587 f3b2605a-c512-4ea7…	Aug 25 2010

				Path
	M			doc/atom_style.html
	M			doc/atom_style.txt
	M			doc/compute_property_atom.html
	M			doc/compute_property_atom.txt
	M			doc/dump.html
	M			doc/dump.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	M			src/atom.cpp
	M			src/atom.h
	M			src/compute_property_atom.cpp
	M			src/compute_property_atom.h
	M			src/dump_custom.cpp
	M			src/dump_custom.h
	M			src/fix_langevin.h
	M			src/min.cpp
	M			src/min.h
	M			src/min_hftn.cpp
	M			src/min_linesearch.cpp
	M			src/pair.h
	M			src/respa.cpp
	M			src/respa.h
	M			src/verlet.cpp
	M			src/verlet.h
	M			src/version.h
	M			tools/restart2data.cpp