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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 28 2016, 13:06.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 28 2016, 13:06

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSfb98050682de: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 28 2016, 13:06

Commit	Author	Details	Committed
ed17939b75d8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14507 f3b2605a-c512-4ea7…	Jan 28 2016
fa7543b714e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14506 f3b2605a-c512-4ea7…	Jan 27 2016
dca90d44b7b6	stamoor	Fixing Kokkos bug	Jan 27 2016

				Path
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_pour.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/atom_vec_tri.cpp
	M			src/atom_vec_tri.h
	M			src/displace_atoms.cpp
	M			src/dump_image.cpp
	M			src/dump_image.h
	M			src/fix_move.cpp