Skip to content
Unverified Commit 2084d065 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'fft' of github.com:stanmoore1/lammps into fft

# Conflicts:
#	doc/src/Build_settings.txt
#	src/KOKKOS/fft3d_kokkos.cpp
parents 73f3019e 4c9d355f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment