Diffusion lammps b3d2b951f527

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 29 2016, 13:00.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/pair_reax.html

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 29 2016, 13:00

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPScedacbc26ea5: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14795 f3b2605a-c512-4ea7…
rLAMMPS5fb8bad60e5d: small updates to address issues flagged by coverity scan

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
cedacbc26ea5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14795 f3b2605a-c512-4ea7…	Mar 28 2016
0c3875c602cf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14794 f3b2605a-c512-4ea7…	Mar 28 2016
c1afa2c1c334	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14793 f3b2605a-c512-4ea7…	Mar 28 2016
f28b6cf0e583	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14792 f3b2605a-c512-4ea7…	Mar 28 2016
aa833f17a1b5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14791 f3b2605a-c512-4ea7…	Mar 28 2016
b5591e451871	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14790 f3b2605a-c512-4ea7…	Mar 28 2016
7cea607190b6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14789 f3b2605a-c512-4ea7…	Mar 28 2016
11034482326b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14788 f3b2605a-c512-4ea7…	Mar 28 2016

Changes (48)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/_sources/Manual.txt
	M			doc/_sources/Section_commands.txt
	A			doc/_sources/compute_angle.txt
	M			doc/_sources/compute_bond.txt
	A			doc/_sources/compute_dihedral.txt
	A			doc/_sources/compute_improper.txt
	M			doc/_sources/compute_pair.txt
	M			doc/_sources/compute_temp.txt
	M			doc/_sources/pair_reax.txt
	M			doc/_sources/pair_reax_c.txt
	M			doc/_sources/pair_soft.txt
	A			doc/_sources/tutorial_github.txt
	P			doc/compute_angle.html Copied from doc/compute_bond.html
	A			doc/compute_angle.rst
	A			doc/compute_angle.txt
	P			doc/compute_bond.html Copied to multiple locations: doc/compute_angle.html doc/compute_dihedral.html doc/compute_improper.html
	M			doc/compute_bond.txt
	P			doc/compute_dihedral.html Copied from doc/compute_bond.html
	A			doc/compute_dihedral.rst
	A			doc/compute_dihedral.txt
	P			doc/compute_improper.html Copied from doc/compute_bond.html
	A			doc/compute_improper.rst
	A			doc/compute_improper.txt
	M			doc/compute_pair.html
	M			doc/compute_pair.txt
	M			doc/compute_temp.html
	M			doc/compute_temp.txt
	M			doc/genindex.html
	M			doc/pair_reax_c.html
	M			doc/pair_soft.html
	M			doc/pair_soft.txt
	M			doc/searchindex.js
	A			src/compute_angle.cpp
	P			src/compute_angle.h Copied from src/compute_bond.h
	M			src/compute_bond.cpp
	P			src/compute_bond.h Copied to multiple locations: src/compute_angle.h src/compute_dihedral.h src/compute_improper.h
	A			src/compute_dihedral.cpp
	P			src/compute_dihedral.h Copied from src/compute_bond.h
	A			src/compute_improper.cpp
	P			src/compute_improper.h Copied from src/compute_bond.h
	M			src/compute_pair.cpp
	M			src/force.cpp
	M			src/force.h
	M			src/version.h