Commit 3ff881ba authored by Luka Stanisic's avatar Luka Stanisic
Browse files

Merge branch 'sluka/BioEM-master'

# Conflicts:
#	Manual/BioEM_Manual.pdf
#	Manual/BioEM_Manual.tex
#	Manual/Fig1_10Dec.eps
#	README.md
#	autotuner.cpp
#	bioem.cpp
#	bioem_algorithm.h
#	bioem_cuda.cu
#	doc/bib_manual.bib
#	include/autotuner.h
#	include/bioem.h
#	include/bioem_cuda_internal.h
#	include/defs.h
#	map.cpp
#	param.cpp
parents 66d95f53 58d2ed37
Pipeline #23595 passed with stages
in 3 minutes and 45 seconds