Merge branch 'merge-pull-37' into lammps-icms
8d48e2b4194b
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 11 2016, 17:10.

Description

Merge branch 'merge-pull-37' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 11 2016, 17:10

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8d48e2b4194b: Merge branch 'merge-pull-37' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 11 2016, 17:10

Commit	Author	Details	Committed
d654d83686ec	Axel Kohlmeyer	also mention the OpenMP version	Mar 11 2016
3d506cf5b348	Axel Kohlmeyer	restore unchanged doc/pair_thole.html file. will be updated upstream.	Mar 11 2016
b17f6a1590fe	Julien Devemy	Docs on lj/cut/thole/long	Mar 11 2016
162222a62cb7	Julien Devémy	Merge pull request #1 from lammps/lammps-icms	Mar 11 2016

				Path
	M			doc/pair_thole.txt