Merge branch 'master' into lammps-icms
ce7ea4907908
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 22 2012, 10:18.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/USER-OMP/pair_lj_cut_tip4p_long_proxy_omp.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 22 2012, 10:18

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSce7ea4907908: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 22 2012, 10:18

Commit	Author	Details	Committed
081640f42286	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8986 f3b2605a-c512-4ea7…	Oct 19 2012
25f111feaa9d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8985 f3b2605a-c512-4ea7…	Oct 19 2012
493410e7edfd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8984 f3b2605a-c512-4ea7…	Oct 19 2012
b8baeea98232	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8983 f3b2605a-c512-4ea7…	Oct 19 2012
c62169953b63	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8982 f3b2605a-c512-4ea7…	Oct 19 2012
0e28d227fe00	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8981 f3b2605a-c512-4ea7…	Oct 19 2012
e4e9c4cb8867	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8979 f3b2605a-c512-4ea7…	Oct 19 2012
18c87471627e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8978 f3b2605a-c512-4ea7…	Oct 19 2012
ad302a878ba5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8977 f3b2605a-c512-4ea7…	Oct 19 2012
8ac15dc83fe4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8976 f3b2605a-c512-4ea7…	Oct 19 2012
f97c62c76ec6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8975 f3b2605a-c512-4ea7…	Oct 19 2012

				Path
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			doc/pair_born.html
	M			doc/pair_born.txt
	M			doc/pair_buck.html
	M			doc/pair_buck.txt
	M			doc/pair_charmm.html
	M			doc/pair_charmm.txt
	M			doc/pair_class2.html
	M			doc/pair_class2.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			examples/COUPLE/fortran2/LAMMPS.F90
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/SHOCK/fix_append_atoms.h
	D			src/USER-OMP/pair_lj_charmm_coul_long_proxy_omp.cpp
	D			src/USER-OMP/pair_lj_charmm_coul_long_proxy_omp.h
	D			src/USER-OMP/pair_lj_class2_coul_long_proxy_omp.cpp
	D			src/USER-OMP/pair_lj_class2_coul_long_proxy_omp.h
	D			src/USER-OMP/pair_lj_cut_coul_long_proxy_omp.cpp
	D			src/USER-OMP/pair_lj_cut_coul_long_proxy_omp.h
	D			src/USER-OMP/pair_lj_cut_tip4p_long_proxy_omp.cpp
	D			src/USER-OMP/pair_lj_cut_tip4p_long_proxy_omp.h
	D			src/USER-OMP/pppm_proxy.cpp
	D			src/USER-OMP/pppm_proxy.h
	D			src/USER-OMP/pppm_tip4p_proxy.cpp
	D			src/USER-OMP/pppm_tip4p_proxy.h
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_hybrid.cpp
	M			src/version.h
	M			tools/restart2data.cpp