Merge branch 'master' into lammps-icms
a4e5548f2eed
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 17 2011, 15:28.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 17 2011, 15:28

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa4e5548f2eed: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 17 2011, 15:28

Commit	Author	Details	Committed
84772682105e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5554 f3b2605a-c512-4ea7…	Jan 14 2011
588574343953	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5553 f3b2605a-c512-4ea7…	Jan 14 2011
e969f7cd30a4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5552 f3b2605a-c512-4ea7…	Jan 14 2011
18b821f1d0d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5551 f3b2605a-c512-4ea7…	Jan 14 2011
57f91d6e5504	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5549 f3b2605a-c512-4ea7…	Jan 14 2011
9b00fc4b997d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5548 f3b2605a-c512-4ea7…	Jan 14 2011
d5b494397e8e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5547 f3b2605a-c512-4ea7…	Jan 14 2011
353439c4148f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5546 f3b2605a-c512-4ea7…	Jan 14 2011

				Path
	M			doc/pair_reax.html
	M			doc/pair_reax.txt
	M			src/CLASS2/dihedral_class2.cpp
	M			src/CLASS2/improper_class2.cpp
	M			src/MANYBODY/fix_qeq_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/improper_cvff.cpp
	M			src/MOLECULE/improper_harmonic.cpp
	M			src/MOLECULE/improper_umbrella.cpp
	M			src/REAX/fix_reax_bonds.cpp
	M			src/REPLICA/neb.cpp
	M			src/REPLICA/prd.cpp
	M			src/REPLICA/tad.cpp
	M			src/SRD/fix_srd.cpp
	M			src/create_atoms.cpp
	M			src/delete_atoms.cpp
	M			src/delete_bonds.cpp
	M			src/displace_atoms.cpp
	M			src/displace_box.cpp
	M			src/dump.cpp
	M			src/dump_atom.cpp
	M			src/dump_custom.cpp
	M			src/dump_local.cpp
	M			src/dump_xyz.cpp
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_time.cpp
	M			src/fix_orient_fcc.cpp
	M			src/fix_shake.cpp
	M			src/fix_tmd.cpp
	M			src/lmptype.h
	M			src/neigh_bond.cpp
	M			src/output.cpp
	M			src/read_data.cpp
	M			src/read_restart.cpp
	M			src/replicate.cpp
	M			src/thermo.cpp
	M			src/variable.cpp
	M			src/velocity.cpp
	M			src/version.h
	M			src/write_restart.cpp