Merge branch 'master' into lammps-icms
3dbe20a8d633
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 9 2010, 19:07.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 9 2010, 19:07

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3dbe20a8d633: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 9 2010, 19:07

Commit	Author	Details	Committed
f16151aab877	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4753 f3b2605a-c512-4ea7…	Sep 9 2010
d49d2e02e534	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4751 f3b2605a-c512-4ea7…	Sep 9 2010
2e5f6d637562	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4750 f3b2605a-c512-4ea7…	Sep 9 2010
acc67e9d8385	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4749 f3b2605a-c512-4ea7…	Sep 9 2010
5b6e63948535	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4748 f3b2605a-c512-4ea7…	Sep 9 2010
712afcc462f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4747 f3b2605a-c512-4ea7…	Sep 9 2010
44a309c8c4e2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4746 f3b2605a-c512-4ea7…	Sep 9 2010
b015f751941c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4745 f3b2605a-c512-4ea7…	Sep 9 2010
3d0668485725	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4744 f3b2605a-c512-4ea7…	Sep 9 2010

				Path
	M			doc/Section_errors.html
	M			doc/Section_errors.txt
	M			doc/if.html
	M			doc/if.txt
	M			doc/run.html
	M			doc/run.txt
	M			src/CLASS2/dihedral_class2.cpp
	M			src/CLASS2/improper_class2.cpp
	M			src/DSMC/pair_dsmc.cpp
	M			src/GRANULAR/fix_pour.cpp
	M			src/MANYBODY/pair_comb.cpp
	M			src/MOLECULE/bond_fene.cpp
	M			src/MOLECULE/bond_fene_expand.cpp
	M			src/MOLECULE/dihedral_charmm.cpp
	M			src/MOLECULE/dihedral_harmonic.cpp
	M			src/MOLECULE/dihedral_helix.cpp
	M			src/MOLECULE/dihedral_multi_harmonic.cpp
	M			src/MOLECULE/dihedral_opls.cpp
	M			src/MOLECULE/fix_bond_create.cpp
	M			src/MOLECULE/improper_cvff.cpp
	M			src/MOLECULE/improper_harmonic.cpp
	M			src/compute_cna_atom.cpp
	M			src/error.cpp
	M			src/error.h
	M			src/fix_deposit.cpp
	M			src/fix_shake.cpp
	M			src/fix_ttm.cpp
	M			src/input.cpp
	M			src/thermo.cpp
	M			src/version.h