Merge remote branch 'lammps-ro/master' into lammps-icms
1b309253113b
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 6 2013, 12:16.

Description

Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 6 2013, 12:16

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1b309253113b: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 6 2013, 12:16

Commit	Author	Details	Committed
bd0aa92c7900	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10730 f3b2605a-c512-4ea7…	Sep 6 2013
8f986a885b8e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10729 f3b2605a-c512-4ea7…	Sep 6 2013
2ba239f94dcb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10728 f3b2605a-c512-4ea7…	Sep 6 2013
6a409dd2c972	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10727 f3b2605a-c512-4ea7…	Sep 6 2013
17a2ffe7de6f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10725 f3b2605a-c512-4ea7…	Sep 6 2013
1f5ceac31982	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10724 f3b2605a-c512-4ea7…	Sep 6 2013
2366287df6e7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10723 f3b2605a-c512-4ea7…	Sep 6 2013
9a19777d4f0e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10722 f3b2605a-c512-4ea7…	Sep 6 2013
48ee436059c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10721 f3b2605a-c512-4ea7…	Sep 6 2013
83fb68d686b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10720 f3b2605a-c512-4ea7…	Sep 5 2013
5994980c73db	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10719 f3b2605a-c512-4ea7…	Sep 5 2013

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/compute.html
	M			doc/compute.txt
	A			doc/compute_erotate_rigid.html
	A			doc/compute_erotate_rigid.txt
	M			doc/compute_ke.html
	M			doc/compute_ke.txt
	A			doc/compute_ke_rigid.html
	A			doc/compute_ke_rigid.txt
	M			doc/fix.html
	M			doc/fix.txt
	M			doc/fix_wall_gran.html
	M			doc/fix_wall_gran.txt
	M			doc/pair_gran.html
	M			doc/pair_gran.txt
	M			src/GRANULAR/fix_wall_gran.cpp
	M			src/GRANULAR/pair_gran_hertz_history.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	A			src/RIGID/compute_erotate_rigid.cpp
	P			src/RIGID/compute_erotate_rigid.h Copied from src/compute_erotate_sphere.h
	A			src/RIGID/compute_ke_rigid.cpp
	P			src/RIGID/compute_ke_rigid.h Copied from src/compute_ke.h
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_rigid_small.h
	M			src/dump_local.cpp
	M			src/fix_property_atom.cpp
	M			src/velocity.cpp
	M			src/version.h