Skip to content
Commit a17356ea authored by Karl Rupp's avatar Karl Rupp
Browse files

Merge branch 'master' of github.com:JurajKabzan/viennacl-dev into JurajKabzan-master 

Conflicts:
	tests/CMakeLists.txt
	viennacl/fft.hpp
parents 537c09fd 222cc426
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment