Merging from master to 13Dec16 version
3e2cd6d265db
Actions

Authored by Stan Moore <stanmoore1@gmail.com> on Dec 14 2016, 19:46.

Description

Merging from master to 13Dec16 version

Committed

Stan Moore <stanmoore1@gmail.com>

Dec 14 2016, 19:46

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Stan Moore <stanmoore1@gmail.com> committed rLAMMPS3e2cd6d265db: Merging from master to 13Dec16 version (authored by Stan Moore <stanmoore1@gmail.com>).Dec 14 2016, 19:46

				Path
	M			src/KOKKOS/pair_dpd_fdt_energy_kokkos.cpp
	M			src/KOKKOS/pair_exp6_rx_kokkos.cpp
	M			src/KOKKOS/pair_multi_lucy_rx_kokkos.cpp
	M			src/KOKKOS/pair_table_rx_kokkos.cpp
	M			src/KOKKOS/pair_table_rx_kokkos.h
	M			src/KOKKOS/pair_vashishta_kokkos.cpp
	M			src/neigh_request.cpp
	M			src/neigh_request.h