Merge branch 'master' into lammps-icms
2aef58a801d4
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 12 2012, 13:18.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 12 2012, 13:18

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2aef58a801d4: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 12 2012, 13:18

Commit	Author	Details	Committed
30489de0efbd	pscrozi	Fixed type-O.	Sep 11 2012
51a07b01d6db	pscrozi	Adding missing semi-colon.	Sep 11 2012
277244a376c1	pscrozi	Got rid of non-standard character and cleared unneeded spaces.	Sep 11 2012
9fe1ae293637	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8770 f3b2605a-c512-4ea7…	Sep 11 2012
31e529748602	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8769 f3b2605a-c512-4ea7…	Sep 11 2012
f74ab7aee281	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8768 f3b2605a-c512-4ea7…	Sep 11 2012
17a4a224a6cb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8767 f3b2605a-c512-4ea7…	Sep 11 2012
257bfccd01da	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8766 f3b2605a-c512-4ea7…	Sep 11 2012
c4da5b2e36c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8765 f3b2605a-c512-4ea7…	Sep 11 2012
f06d06671f80	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8764 f3b2605a-c512-4ea7…	Sep 11 2012
edeec7b788a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8763 f3b2605a-c512-4ea7…	Sep 11 2012

				Path
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			examples/COUPLE/fortran2/LAMMPS.F90
	M			examples/COUPLE/fortran2/makefile
	M			src/KSPACE/pppm.cpp
	M			src/MOLECULE/angle_hybrid.cpp
	M			src/bond_hybrid.cpp
	M			src/library.cpp
	M			src/version.h