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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 23 2014, 12:37.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_errors.txt
doc/Section_start.txt
src/USER-FEP/Install.sh
src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp

Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 23 2014, 12:37

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSe9652224bfd1: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12019 f3b2605a-c512-4ea7…
rLAMMPS3bd25198e99a: undo unintentional changes in upstream

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS122cdf2c39de: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 23 2014, 12:37

Merged Changes

Commit	Author	Details	Committed
e9652224bfd1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12019 f3b2605a-c512-4ea7…	May 22 2014
10d5936eaf24	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12018 f3b2605a-c512-4ea7…	May 22 2014
a59a131024a2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12017 f3b2605a-c512-4ea7…	May 22 2014
d45d19209106	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12016 f3b2605a-c512-4ea7…	May 22 2014
051dfb070600	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12015 f3b2605a-c512-4ea7…	May 22 2014
eeb19e88b862	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12014 f3b2605a-c512-4ea7…	May 22 2014
afabef346579	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12013 f3b2605a-c512-4ea7…	May 22 2014
736ec5ce5ea8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12012 f3b2605a-c512-4ea7…	May 22 2014
b97a4d3c3873	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12011 f3b2605a-c512-4ea7…	May 22 2014
e8ec5114a9e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12010 f3b2605a-c512-4ea7…	May 22 2014
ffd2b394712e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12009 f3b2605a-c512-4ea7…	May 22 2014

Changes (27)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_errors.html
	M			doc/Section_errors.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/dump_image.html
	M			doc/dump_image.txt
	M			doc/pair_lj_soft.html
	M			doc/pair_lj_soft.txt
	M			doc/restart.html
	M			doc/restart.txt
	M			doc/run.html
	M			doc/run.txt
	M			src/USER-OMP/pair_lj_charmm_coul_long_omp.cpp
	M			src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp
	M			src/comm_tiled.cpp
	M			src/comm_tiled.h
	M			src/dump.cpp
	M			src/dump.h
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/version.h
	M			src/write_restart.cpp