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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 8 2016, 12:24.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 8 2016, 12:24

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
e9085c47c15c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14817 f3b2605a-c512-4ea7…	Apr 8 2016
dd562698ef4d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14816 f3b2605a-c512-4ea7…	Apr 8 2016
9aa7608bd0d7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14814 f3b2605a-c512-4ea7…	Apr 8 2016
9c1857fa6297	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14813 f3b2605a-c512-4ea7…	Apr 8 2016
6a1e85d32ae0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14812 f3b2605a-c512-4ea7…	Apr 7 2016
5dceda8b15a0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14811 f3b2605a-c512-4ea7…	Apr 7 2016
d8a711e50ea1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14810 f3b2605a-c512-4ea7…	Apr 7 2016
13c554900998	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14809 f3b2605a-c512-4ea7…	Apr 7 2016
008896a77d6c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14808 f3b2605a-c512-4ea7…	Apr 7 2016
67a4004f2353	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14807 f3b2605a-c512-4ea7…	Apr 7 2016
1e180da83007	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14806 f3b2605a-c512-4ea7…	Apr 7 2016
8e36364f5cea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14805 f3b2605a-c512-4ea7…	Apr 7 2016

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	P			doc/_images/fix_nh1.jpg Copied from doc/Eqs/fix_nh1.jpg
	M			doc/_sources/Manual.txt
	M			doc/_sources/Section_commands.txt
	M			doc/_sources/bond_table.txt
	P			doc/_sources/bond_write.txt Copied from doc/bond_write.txt
	M			doc/_sources/lattice.txt
	M			doc/_sources/pair_colloid.txt
	M			doc/_sources/pair_dpd.txt
	M			doc/_sources/pair_table.txt
	M			doc/_sources/pair_tersoff_mod.txt
	M			doc/_sources/pair_tersoff_zbl.txt
	M			doc/_sources/pair_write.txt
	M			doc/_sources/temper.txt
	M			doc/bond_table.html
	P			doc/bond_write.html Copied from doc/pair_write.html
	M			doc/genindex.html
	M			doc/lattice.html
	M			doc/pair_colloid.html
	M			doc/pair_dpd.html
	M			doc/pair_table.html
	M			doc/pair_tersoff_mod.html
	M			doc/pair_tersoff_zbl.html
	P			doc/pair_write.html Copied to doc/bond_write.html
	M			doc/searchindex.js
	M			doc/temper.html
	M			src/Make.py
	M			src/Makefile
	M			src/USER-INTEL/TEST/README
	M			src/USER-INTEL/TEST/in.intel.lc
	A			src/USER-INTEL/TEST/in.intel.lj
	M			src/USER-INTEL/TEST/in.intel.rhodo
	M			src/USER-INTEL/TEST/in.intel.sw
	M			src/USER-INTEL/TEST/in.intel.tersoff
	M			src/USER-INTEL/TEST/in.intel.water
	A			src/USER-INTEL/TEST/in.lc_generate_restart
	M			src/USER-INTEL/neigh_half_bin_intel.cpp
	M			src/version.h