Topic merge1.1.0 back to dev

alpaka-group / alpaka

Abstraction Library for Parallel Kernel Acceleration :llama:

https://alpaka.readthedocs.io

Mozilla Public License 2.0

353 stars 72 forks source link

Closed psychocoderHPC closed 8 months ago

psychocoderHPC commented 8 months ago

merge 1.1.0 release changes into the develop branch.

git merge -X ours --no-ff 1.1.0

bernhardmgruber commented 8 months ago

GitHub says:

This branch cannot be rebased due to conflicts

@psychocoderHPC please fix :)

psychocoderHPC commented 8 months ago

@bernhardmgruber I fixed the conflict.