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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 23 2013, 12:49.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/USER-CG-CMM/angle_cg_cmm.h
src/USER-CG-CMM/cg_cmm_parms.h
src/USER-CG-CMM/pair_cg_cmm.h
src/USER-CG-CMM/pair_cg_cmm_coul_cut.h
tools/restart2data.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 23 2013, 12:49

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS5618d5818416: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11053 f3b2605a-c512-4ea7…
rLAMMPSa01d39bf57f0: Merge remote branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSfb7ecfd4a8cc: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 23 2013, 12:49

Merged Changes

Commit	Author	Details	Committed
5618d5818416	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11053 f3b2605a-c512-4ea7…	Nov 22 2013
f447886276f8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11052 f3b2605a-c512-4ea7…	Nov 22 2013
13ebf5b7dbe9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11051 f3b2605a-c512-4ea7…	Nov 22 2013
1606794713c6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11050 f3b2605a-c512-4ea7…	Nov 22 2013
71505620f577	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11048 f3b2605a-c512-4ea7…	Nov 22 2013
66846a987365	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11047 f3b2605a-c512-4ea7…	Nov 22 2013
930149e5e656	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11046 f3b2605a-c512-4ea7…	Nov 22 2013
8f51332adfcd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11045 f3b2605a-c512-4ea7…	Nov 22 2013
8ff753d958a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11044 f3b2605a-c512-4ea7…	Nov 22 2013

Changes (79)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/Section_tools.html
	M			doc/Section_tools.txt
	M			doc/read_dump.html
	M			doc/read_dump.txt
	M			doc/read_restart.html
	M			doc/read_restart.txt
	M			doc/restart.html
	M			doc/restart.txt
	M			doc/write_data.html
	M			doc/write_data.txt
	M			doc/write_restart.html
	M			doc/write_restart.txt
	M			src/ASPHERE/pair_gayberne.cpp
	M			src/ASPHERE/pair_gayberne.h
	M			src/COLLOID/pair_colloid.cpp
	M			src/COLLOID/pair_colloid.h
	M			src/COLLOID/pair_yukawa_colloid.cpp
	M			src/KSPACE/pair_born_coul_long.cpp
	M			src/KSPACE/pair_born_coul_long.h
	M			src/KSPACE/pair_buck_coul_long.cpp
	M			src/KSPACE/pair_buck_coul_long.h
	M			src/KSPACE/pair_buck_long_coul_long.cpp
	M			src/KSPACE/pair_buck_long_coul_long.h
	M			src/KSPACE/pair_lj_cut_tip4p_long.cpp
	M			src/KSPACE/pair_lj_long_coul_long.cpp
	M			src/KSPACE/pair_lj_long_coul_long.h
	M			src/MOLECULE/pair_lj_cut_tip4p_cut.cpp
	M			src/MOLECULE/pair_lj_cut_tip4p_cut.h
	M			src/USER-CG-CMM/Install.sh
	D			src/USER-CG-CMM/angle_cg_cmm.cpp
	D			src/USER-CG-CMM/angle_cg_cmm.h
	D			src/USER-CG-CMM/cg_cmm_parms.cpp
	D			src/USER-CG-CMM/cg_cmm_parms.h
	D			src/USER-CG-CMM/pair_cg_cmm.cpp
	D			src/USER-CG-CMM/pair_cg_cmm.h
	D			src/USER-CG-CMM/pair_cg_cmm_coul_cut.cpp
	D			src/USER-CG-CMM/pair_cg_cmm_coul_cut.h
	D			src/USER-CG-CMM/pair_cg_cmm_coul_long.cpp
	D			src/USER-CG-CMM/pair_cg_cmm_coul_long.h
	M			src/lammps.cpp
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/pair_born.cpp
	M			src/pair_born.h
	M			src/pair_born_coul_wolf.cpp
	M			src/pair_born_coul_wolf.h
	M			src/pair_buck.cpp
	M			src/pair_buck.h
	M			src/pair_buck_coul_cut.cpp
	M			src/pair_buck_coul_cut.h
	M			src/pair_coul_wolf.cpp
	M			src/pair_dpd.cpp
	M			src/pair_dpd.h
	M			src/pair_dpd_tstat.cpp
	M			src/pair_dpd_tstat.h
	M			src/pair_lj96_cut.cpp
	M			src/pair_lj96_cut.h
	M			src/pair_lj_gromacs.cpp
	M			src/pair_lj_gromacs.h
	M			src/pair_lj_gromacs_coul_gromacs.cpp
	M			src/pair_lj_gromacs_coul_gromacs.h
	M			src/pair_lj_smooth.cpp
	M			src/pair_lj_smooth.h
	M			src/pair_morse.cpp
	M			src/pair_morse.h
	M			src/pair_soft.cpp
	M			src/pair_soft.h
	M			src/pair_yukawa.cpp
	M			src/pair_yukawa.h
	M			src/version.h
	M			tools/Makefile
	M			tools/README