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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 29 2016, 13:16.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 29 2016, 13:16

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
df720a4565f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15233 f3b2605a-c512-4ea7…	Jun 29 2016
c242bca4d1f7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15230 f3b2605a-c512-4ea7…	Jun 28 2016
a01d08aba493	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15229 f3b2605a-c512-4ea7…	Jun 28 2016
42071be08c7f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15228 f3b2605a-c512-4ea7…	Jun 28 2016
8c63302c82fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15227 f3b2605a-c512-4ea7…	Jun 28 2016
788ba5543675	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15226 f3b2605a-c512-4ea7…	Jun 28 2016
cec2f2518f68	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15225 f3b2605a-c512-4ea7…	Jun 28 2016
bcac93f7a222	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15224 f3b2605a-c512-4ea7…	Jun 28 2016
ab2fe0113ef4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15223 f3b2605a-c512-4ea7…	Jun 28 2016

				Path
	M			doc/html/Manual.html
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/package.txt
	M			doc/html/package.html
	M			doc/html/searchindex.js
	M			doc/src/Manual.txt
	M			doc/src/fix_rx.txt
	M			doc/src/package.txt
	M			examples/USER/dpd/dpdrx-shardlow/in.dpdrx
	M			src/USER-DPD/fix_eos_table_rx.cpp
	M			src/USER-DPD/fix_eos_table_rx.h
	M			src/USER-DPD/fix_rx.cpp
	M			src/USER-DPD/fix_rx.h
	M			src/USER-DPD/pair_exp6_rx.cpp
	M			src/USER-DPD/pair_exp6_rx.h
	M			src/USER-DPD/pair_multi_lucy_rx.cpp
	M			src/USER-DPD/pair_multi_lucy_rx.h
	M			src/USER-DPD/pair_table_rx.cpp
	M			src/USER-DPD/pair_table_rx.h
	M			src/USER-INTEL/Install.sh
	M			src/USER-INTEL/README
	M			src/USER-INTEL/fix_intel.cpp
	M			src/USER-INTEL/fix_intel.h
	M			src/USER-INTEL/pair_buck_coul_long_intel.cpp
	M			src/USER-INTEL/pair_buck_coul_long_intel.h
	M			src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
	M			src/USER-INTEL/pair_lj_charmm_coul_long_intel.h
	M			src/USER-INTEL/pair_lj_cut_coul_long_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_coul_long_intel.h
	M			src/USER-INTEL/pppm_intel.cpp
	M			src/USER-INTEL/pppm_intel.h
	A			src/USER-INTEL/verlet_lrt_intel.cpp
	A			src/USER-INTEL/verlet_lrt_intel.h
	M			src/fix_store.cpp
	M			src/version.h