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

Merge branch 'release-1.4.2' 

Conflicts:
	README
	doc/viennacl.pdf
	viennacl/matrix.hpp
	viennacl/vector.hpp
parents 0b8ccd19 0e768092
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment