Merge branch 'master' into lammps-icms
d018338c60f0
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 22 2012, 12:01.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/fix_rigid_nve.h

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 22 2012, 12:01

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd018338c60f0: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 22 2012, 12:01

Commit	Author	Details	Committed
7c286225e4d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8686 f3b2605a-c512-4ea7…	Aug 19 2012
487d2437bf7c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8684 f3b2605a-c512-4ea7…	Aug 19 2012
45ea90af4b03	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8683 f3b2605a-c512-4ea7…	Aug 19 2012
eeafb9cfd5a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8682 f3b2605a-c512-4ea7…	Aug 19 2012
da4dc7378411	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8681 f3b2605a-c512-4ea7…	Aug 19 2012

				Path
	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
	A			examples/rigid/data.rigid.tnr
	A			examples/rigid/in.rigid.tnr
	A			examples/rigid/log.rigid.tnr.9Jan12.linux.1
	A			examples/rigid/log.rigid.tnr.9Jan12.linux.4
	M			src/fix_rigid.cpp
	M			src/fix_rigid.h
	A			src/fix_rigid_nh.cpp
	A			src/fix_rigid_nh.h
	P			src/fix_rigid_nph.cpp Copied from src/fix_nph.cpp
	P			src/fix_rigid_nph.h Copied from src/ASPHERE-POINT/fix_nvt_asphere.h
	A			src/fix_rigid_npt.cpp
	P			src/fix_rigid_npt.h Copied from src/ASPHERE-POINT/fix_nvt_asphere.h
	P			src/fix_rigid_nve.cpp Copied from src/MANYBODY/pair_rebo.cpp
	M			src/fix_rigid_nve.h
	M			src/fix_rigid_nvt.cpp
	P			src/fix_rigid_nvt.h Copied from src/USER-EFF/fix_nph_eff.h
	M			src/version.h