Merge branch 'master' into lammps-icms
5fce6203bdf1
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 19 2012, 23:33.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 19 2012, 23:33

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5fce6203bdf1: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 19 2012, 23:33

Commit	Author	Details	Committed
a7996eef64ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8799 f3b2605a-c512-4ea7…	Sep 19 2012
356d67afc8d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8798 f3b2605a-c512-4ea7…	Sep 19 2012
56e152e97d28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8796 f3b2605a-c512-4ea7…	Sep 19 2012
1bc399ec3633	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8795 f3b2605a-c512-4ea7…	Sep 19 2012
6367c8b60172	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8794 f3b2605a-c512-4ea7…	Sep 19 2012
7599fe233d75	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8793 f3b2605a-c512-4ea7…	Sep 18 2012

				Path
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
	M			src/KSPACE/pppm_tip4p.cpp
	M			src/KSPACE/pppm_tip4p.h
	M			src/MANYBODY/pair_eam.cpp
	M			src/MANYBODY/pair_eam.h
	M			src/MANYBODY/pair_eam_alloy.cpp
	M			src/MANYBODY/pair_eam_fs.cpp
	M			src/MOLECULE/angle_table.cpp
	M			src/MOLECULE/bond_table.cpp
	M			src/OPT/pair_eam_opt.cpp
	M			src/USER-MISC/dihedral_table.cpp
	M			src/fix_thermal_conductivity.cpp
	M			src/pair.cpp
	M			src/pair.h
	M			src/version.h