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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 2 2015, 21:23.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
src/USER-FEP/pair_lj_cut_soft.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 2 2015, 21:23

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSd98318fd763f: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13015 f3b2605a-c512-4ea7…
rLAMMPSf6a3e25e27a3: remove obsolete warning

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc3cb0e91244a: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 2 2015, 21:23

Merged Changes

Commit	Author	Details	Committed
d98318fd763f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13015 f3b2605a-c512-4ea7…	Jan 30 2015
e1285bf8462f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13014 f3b2605a-c512-4ea7…	Jan 30 2015
f0297dc77907	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13013 f3b2605a-c512-4ea7…	Jan 30 2015
7188f4a72a06	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13012 f3b2605a-c512-4ea7…	Jan 30 2015
dc2d3afff51c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13011 f3b2605a-c512-4ea7…	Jan 30 2015
cef3a9da4757	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13010 f3b2605a-c512-4ea7…	Jan 30 2015
8d657c5391d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13009 f3b2605a-c512-4ea7…	Jan 30 2015
e1cd500a2146	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13008 f3b2605a-c512-4ea7…	Jan 30 2015

Changes (41)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/compute_com.html
	M			doc/compute_com.txt
	M			doc/compute_com_molecule.html
	M			doc/compute_com_molecule.txt
	M			doc/compute_displace_atom.html
	M			doc/compute_displace_atom.txt
	M			doc/compute_inertia_molecule.html
	M			doc/compute_inertia_molecule.txt
	M			doc/compute_msd.html
	M			doc/compute_msd.txt
	M			doc/compute_msd_molecule.html
	M			doc/compute_msd_molecule.txt
	M			doc/create_box.html
	M			doc/create_box.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	M			src/QEQ/fix_qeq.cpp
	M			src/QEQ/fix_qeq.h
	M			src/QEQ/fix_qeq_dynamic.cpp
	M			src/QEQ/fix_qeq_point.cpp
	M			src/QEQ/fix_qeq_shielded.cpp
	M			src/QEQ/fix_qeq_slater.cpp
	M			src/QEQ/fix_qeq_slater.h
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_nh.cpp
	M			src/RIGID/fix_rigid_nh_small.cpp
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_rigid_small.h
	M			src/compute.cpp
	M			src/compute.h
	M			src/domain.cpp
	M			src/fix.cpp
	M			src/fix.h
	M			src/thermo.cpp
	M			src/variable.cpp
	M			src/version.h