Diffusion lammps 2762a07efdb4

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

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

Description

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

#Resolved Conflicts:

src/Makefile

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 8 2016, 13:41

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSee1805538c77: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14726 f3b2605a-c512-4ea7…
rLAMMPSec96d05bc174: remove bogus include and fix path separator bug

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
ee1805538c77	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14726 f3b2605a-c512-4ea7…	Mar 7 2016
f4ac444db294	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14725 f3b2605a-c512-4ea7…	Mar 7 2016
0e5c36676f1d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14724 f3b2605a-c512-4ea7…	Mar 7 2016

Changes (52)

				Path
	M			doc/Manual.html
	M			doc/Section_example.html
	M			doc/Section_example.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/Section_perf.html
	M			doc/Section_perf.txt
	M			doc/_sources/Section_example.txt
	M			doc/_sources/Section_packages.txt
	M			doc/_sources/Section_perf.txt
	M			doc/_sources/accelerate_kokkos.txt
	M			doc/_sources/pair_brownian.txt
	M			doc/_sources/pair_lubricate.txt
	M			doc/_sources/pair_lubricateU.txt
	M			doc/_sources/pair_peri.txt
	M			doc/accelerate_kokkos.html
	M			doc/accelerate_kokkos.txt
	M			doc/pair_brownian.html
	M			doc/pair_brownian.txt
	M			doc/pair_lubricate.html
	M			doc/pair_lubricate.txt
	M			doc/pair_lubricateU.html
	M			doc/pair_lubricateU.txt
	M			doc/pair_peri.html
	M			doc/pair_peri.txt
	M			doc/searchindex.js
	V			src/{COLLOID ← FLD}/pair_brownian.cpp
	V			src/{COLLOID ← FLD}/pair_brownian.h
	V			src/{COLLOID ← FLD}/pair_brownian_poly.cpp
	V			src/{COLLOID ← FLD}/pair_brownian_poly.h
	V			src/{COLLOID ← FLD}/pair_lubricate.cpp
	V			src/{COLLOID ← FLD}/pair_lubricate.h
	V			src/{COLLOID ← FLD}/pair_lubricateU.cpp
	V			src/{COLLOID ← FLD}/pair_lubricateU.h
	V			src/{COLLOID ← FLD}/pair_lubricateU_poly.cpp
	V			src/{COLLOID ← FLD}/pair_lubricateU_poly.h
	V			src/{COLLOID ← FLD}/pair_lubricate_poly.cpp
	V			src/{COLLOID ← FLD}/pair_lubricate_poly.h
	D			src/FLD
	V			src/{FLD → COLLOID}/pair_brownian.cpp
	V			src/{FLD → COLLOID}/pair_brownian.h
	V			src/{FLD → COLLOID}/pair_brownian_poly.cpp
	V			src/{FLD → COLLOID}/pair_brownian_poly.h
	V			src/{FLD → COLLOID}/pair_lubricate.cpp
	V			src/{FLD → COLLOID}/pair_lubricate.h
	V			src/{FLD → COLLOID}/pair_lubricateU.cpp
	V			src/{FLD → COLLOID}/pair_lubricateU.h
	V			src/{FLD → COLLOID}/pair_lubricateU_poly.cpp
	V			src/{FLD → COLLOID}/pair_lubricateU_poly.h
	V			src/{FLD → COLLOID}/pair_lubricate_poly.cpp
	V			src/{FLD → COLLOID}/pair_lubricate_poly.h
	M			src/Makefile