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

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

Conflicts:
	viennacl/linalg/host_based/matrix_operations.hpp
parents 4db6d47d 078c83d9
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