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

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

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 14 2016, 12:19

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
c46d973c2bc9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14823 f3b2605a-c512-4ea7…	Apr 14 2016
92fa12cc3256	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14822 f3b2605a-c512-4ea7…	Apr 14 2016
e564fc4de3bf	stamoor	Fixing Kokkos default values	Apr 13 2016

				Path
	M			doc/_sources/Manual.txt
	M			doc/_sources/fix_nh.txt
	M			doc/_sources/fix_press_berendsen.txt
	M			doc/fix_nh.html
	M			doc/fix_nh.txt
	M			doc/fix_press_berendsen.html
	M			doc/fix_press_berendsen.txt
	M			doc/pair_colloid.html
	M			doc/searchindex.js
	M			src/KOKKOS/kokkos.cpp