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

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

Description

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

CResolved onflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_commands.txt
doc/Section_packages.txt
doc/compute_fep.html
doc/compute_fep.txt
doc/fix_adapt_fep.html
doc/fix_adapt_fep.txt
doc/pair_lj_soft.html
doc/pair_lj_soft.txt
src/USER-FEP/Install.sh
src/USER-FEP/README
src/USER-FEP/compute_fep.cpp
src/USER-OMP/pair_coul_cut_soft_omp.cpp
src/USER-OMP/pair_coul_long_soft_omp.cpp
src/USER-OMP/pair_lj_cut_coul_cut_soft_omp.cpp
src/USER-OMP/pair_lj_cut_coul_long_soft_omp.cpp
src/USER-OMP/pair_lj_cut_soft_omp.cpp
src/USER-OMP/pair_lj_cut_tip4p_long_soft_omp.cpp
src/USER-OMP/pair_tip4p_long_soft_omp.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 10 2014, 23:15

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSfd1b9f2c5c32: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11968 f3b2605a-c512-4ea7…
rLAMMPSf449ea4eaafc: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
fd1b9f2c5c32	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11968 f3b2605a-c512-4ea7…	May 9 2014
196f3c28411c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11966 f3b2605a-c512-4ea7…	May 9 2014
3d16253e133a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11965 f3b2605a-c512-4ea7…	May 9 2014
1ea4bc8d6fc7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11963 f3b2605a-c512-4ea7…	May 9 2014
e70a48dc85ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11962 f3b2605a-c512-4ea7…	May 9 2014
f4f7e8b1b582	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11961 f3b2605a-c512-4ea7…	May 9 2014
358568b55d30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11960 f3b2605a-c512-4ea7…	May 9 2014
812dbd651411	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11959 f3b2605a-c512-4ea7…	May 9 2014
c21d8f9342da	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11958 f3b2605a-c512-4ea7…	May 9 2014
e428c83f240c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11957 f3b2605a-c512-4ea7…	May 9 2014
944b898d7128	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11956 f3b2605a-c512-4ea7…	May 9 2014
db78f042efe3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11955 f3b2605a-c512-4ea7…	May 9 2014
153de89ab331	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11954 f3b2605a-c512-4ea7…	May 9 2014
a93cebcc2d06	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11953 f3b2605a-c512-4ea7…	May 9 2014
425fad8f71a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11952 f3b2605a-c512-4ea7…	May 9 2014
1e871c456eec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11951 f3b2605a-c512-4ea7…	May 9 2014

Changes (29)

				Path
	P			doc/Manual.html Copied to doc/Manual.html.html
	P			doc/Manual.html.html Copied from doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/Section_tools.html
	M			doc/Section_tools.txt
	M			doc/compute_fep.html
	M			doc/compute_fep.txt
	M			doc/fix_adapt.html
	M			doc/fix_adapt.txt
	M			doc/fix_adapt_fep.html
	M			doc/fix_adapt_fep.txt
	M			doc/pair_lj_soft.html
	M			doc/pair_lj_soft.txt
	A			examples/USER/fep/CC-CO/fep01/log.reference
	A			examples/USER/fep/CC-CO/fep01/log.reference-omp
	M			src/USER-FEP/README
	M			src/fix.h
	M			src/fix_adapt.cpp
	M			src/fix_adapt.h
	M			src/irregular.cpp
	M			src/modify.cpp
	M			src/read_restart.cpp
	M			src/version.h
	M			tools/README
	A			tools/fep/README

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

Description

Details

Event Timeline

Merged Changes

Changes (29)

rLAMMPS24fb679e5579

doc/Manual.html

doc/Manual.html.html

doc/Manual.txt

doc/Section_commands.html

doc/Section_commands.txt

doc/Section_packages.html

doc/Section_packages.txt

doc/Section_tools.html

doc/Section_tools.txt

doc/compute_fep.html

doc/compute_fep.txt

doc/fix_adapt.html

doc/fix_adapt.txt

doc/fix_adapt_fep.html

doc/fix_adapt_fep.txt

doc/pair_lj_soft.html

doc/pair_lj_soft.txt

examples/USER/fep/CC-CO/fep01/log.reference

examples/USER/fep/CC-CO/fep01/log.reference-omp

src/USER-FEP/README

src/fix.h

src/fix_adapt.cpp

src/fix_adapt.h

src/irregular.cpp

src/modify.cpp

src/read_restart.cpp

src/version.h

tools/README

tools/fep/README

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