Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
e240e15c4d5f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 9 2013, 14:35.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
src/USER-MISC/dihedral_nharmonic.cpp
src/USER-MISC/pair_lj_sf_dipole_sf.h

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 9 2013, 14:35

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
be25ac9878d0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10061 f3b2605a-c512-4ea7…	Jun 9 2013
65a19bf52bc2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10056 f3b2605a-c512-4ea7…	Jun 8 2013
79f5cde44988	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10055 f3b2605a-c512-4ea7…	Jun 8 2013
2a3686c20105	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10054 f3b2605a-c512-4ea7…	Jun 8 2013
3e5c7ae60f03	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10053 f3b2605a-c512-4ea7…	Jun 8 2013
00fe31ddd407	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10052 f3b2605a-c512-4ea7…	Jun 8 2013
eec6088ce751	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10051 f3b2605a-c512-4ea7…	Jun 8 2013
5f25e2a82802	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10050 f3b2605a-c512-4ea7…	Jun 8 2013

				Path
	M			doc/Manual.html
	M			doc/Manual.pdf
	M			doc/Manual.txt
	M			lib/atc/ATC_TransferHardy.cpp
	M			src/DIPOLE/pair_lj_cut_dipole_cut.h
	M			src/GPU/pair_lj_cut_dipole_cut_gpu.cpp
	M			src/GPU/pair_lj_cut_dipole_cut_gpu.h
	M			src/GPU/pair_lj_sf_dipole_sf_gpu.cpp
	M			src/GPU/pair_lj_sf_dipole_sf_gpu.h
	V			src/{KSPACE → }/math_complex.h
	V			src/{KSPACE → }/math_vector.h
	M			src/KSPACE/pppm_disp_tip4p.cpp
	M			src/USER-MISC/dihedral_nharmonic.cpp
	M			src/USER-MISC/pair_lj_sf_dipole_sf.h
	M			src/USER-OMP/msm_omp.h
	M			src/USER-OMP/pair_lj_cut_dipole_cut_omp.cpp
	M			src/USER-OMP/pair_lj_cut_dipole_cut_omp.h
	M			src/USER-OMP/pair_lj_sf_dipole_sf_omp.cpp
	M			src/USER-OMP/pair_lj_sf_dipole_sf_omp.h
	V			src/{ ← KSPACE}/math_complex.h
	V			src/{ ← KSPACE}/math_vector.h
	M			src/version.h