Merge branch 'master' into lammps-icms
f65e120565dc
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 8 2012, 17:06.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/KSPACE/ewald.cpp
src/KSPACE/pppm.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 8 2012, 17:06

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf65e120565dc: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 8 2012, 17:06

Commit	Author	Details	Committed
556f92cbe571	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7925 f3b2605a-c512-4ea7…	Mar 7 2012
6c836ed0e4c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7924 f3b2605a-c512-4ea7…	Mar 7 2012
b26635580a2f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7923 f3b2605a-c512-4ea7…	Mar 7 2012
a1f79c40fe04	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7922 f3b2605a-c512-4ea7…	Mar 7 2012
fd73d2de7ddd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7921 f3b2605a-c512-4ea7…	Mar 7 2012

				Path
	M			doc/dihedral_table.html
	M			doc/dihedral_table.txt
	M			doc/fix_bond_swap.html
	M			doc/fix_bond_swap.txt
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/pppm.cpp
	M			src/USER-REAXC/fix_qeq_reax.cpp