Merge branch 'master' into lammps-icms
af1a391cf388
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 2 2010, 18:58.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 2 2010, 18:58

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSaf1a391cf388: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 2 2010, 18:58

Commit	Author	Details	Committed
11b28d8711f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4082 f3b2605a-c512-4ea7…	May 2 2010
9cd6a7317971	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4080 f3b2605a-c512-4ea7…	May 2 2010
2fc3c9fbffab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4079 f3b2605a-c512-4ea7…	May 2 2010
7cb9a802ad7d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4078 f3b2605a-c512-4ea7…	May 2 2010

				Path
	M			doc/Eqs/box.jpg
	M			doc/Eqs/box.tex
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/fix.html
	M			doc/fix.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	A			src/fix_rigid_nve.cpp
	P			src/fix_rigid_nve.h Copied from src/fix_nve_sphere.h
	A			src/fix_rigid_nvt.cpp
	A			src/fix_rigid_nvt.h
	M			src/version.h