Diffusion lammps 53ebd8cfeb5a

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 13 2016, 13:02.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 13 2016, 13:02

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSe58791e29d4b: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15296 f3b2605a-c512-4ea7…
rLAMMPSc7e4cf7d332b: Merge branch 'merge-qe-qmmm' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS53ebd8cfeb5a: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 13 2016, 13:02

Merged Changes

Commit	Author	Details	Committed
e58791e29d4b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15296 f3b2605a-c512-4ea7…	Jul 13 2016
e3e7d0280d06	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15295 f3b2605a-c512-4ea7…	Jul 13 2016
f9047919e8f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15294 f3b2605a-c512-4ea7…	Jul 13 2016
070ca2614844	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15293 f3b2605a-c512-4ea7…	Jul 13 2016
5783c78f4462	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15292 f3b2605a-c512-4ea7…	Jul 13 2016
eec4d961c0c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15291 f3b2605a-c512-4ea7…	Jul 13 2016
6ec2346ca0f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15290 f3b2605a-c512-4ea7…	Jul 13 2016
c5aece5b435f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15289 f3b2605a-c512-4ea7…	Jul 13 2016
0ff512a6da4e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15288 f3b2605a-c512-4ea7…	Jul 13 2016
568c530bfe28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15287 f3b2605a-c512-4ea7…	Jul 13 2016
3f802d97c9a2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15286 f3b2605a-c512-4ea7…	Jul 13 2016
1df9db5091da	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15285 f3b2605a-c512-4ea7…	Jul 13 2016
bf9e82105508	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15284 f3b2605a-c512-4ea7…	Jul 12 2016
dfbecf047fdd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15283 f3b2605a-c512-4ea7…	Jul 12 2016

Changes (36)

				Path
	M			doc/html/Manual.html
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/compute_modify.txt
	M			doc/html/_sources/compute_pe.txt
	M			doc/html/_sources/compute_pe_atom.txt
	M			doc/html/_sources/fix_modify.txt
	M			doc/html/_sources/fix_rx.txt
	M			doc/html/compute_modify.html
	M			doc/html/compute_pe.html
	M			doc/html/compute_pe_atom.html
	M			doc/html/fix_modify.html
	M			doc/html/fix_rx.html
	M			doc/html/searchindex.js
	M			doc/src/Manual.txt
	M			doc/src/compute_modify.txt
	M			doc/src/compute_pe.txt
	M			doc/src/compute_pe_atom.txt
	M			doc/src/fix_modify.txt
	M			src/RIGID/fix_shake.cpp
	M			src/angle.cpp
	M			src/compute.cpp
	M			src/compute.h
	M			src/compute_pe.cpp
	M			src/compute_pe.h
	M			src/compute_pe_atom.cpp
	M			src/compute_pe_atom.h
	M			src/dihedral.cpp
	M			src/fix.cpp
	M			src/fix.h
	M			src/improper.cpp
	M			src/integrate.h
	M			src/modify.cpp
	M			src/modify.h
	M			src/pair.h
	M			src/respa.cpp
	M			src/version.h