add
commit
Merge branch 'master' of https://github.com/denis14/ViennaCL-1.5.2

Conflicts:
	build/CMakeCache.txt
	build/CMakeFiles/CMakeRuleHashes.txt
	build/CMakeFiles/Makefile2
	build/CMakeFiles/TargetDirectories.txt
	build/libviennacl/CMakeFiles/viennacl.dir/build.make
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_backend.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas1.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas1_cuda.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas1_host.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas1_opencl.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas2.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas2_cuda.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas2_host.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas2_opencl.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas3.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas3_cuda.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas3_host.cu.o.cmake
	build/libviennacl/CMakeFiles/viennacl.dir/src/viennacl_generated_blas3_opencl.cu.o.cmake
	build/tests/CMakeFiles/a_cuda-test-cuda.dir/build.make
	build/tests/CMakeFiles/a_cuda-test-cuda.dir/src/a_cuda-test-cuda_generated_a_cuda.cu.o.cmake
	build/tests/CMakeFiles/blas3_prod_double-test-cuda.dir/build.make
	build/tests/CMakeFiles/blas3_prod_double-test-cuda.dir/src/blas3_prod_double-test-cuda_generated_blas3_prod_double.cu.o.cmake
	build/tests/CMakeFiles/blas3_prod_float-test-cuda.dir/build.make
	build/tests/CMakeFiles/blas3_prod_float-test-cuda.dir/src/blas3_prod_float-test-cuda_generated_blas3_prod_float.cu.o.cmake
	build/tests/CMakeFiles/blas3_solve_double-test-cuda.dir/build.make
	build/tests/CMakeFiles/blas3_solve_double-test-cuda.dir/src/blas3_solve_double-test-cuda_generated_blas3_solve_double.cu.o.cmake
	build/tests/CMakeFiles/blas3_solve_float-test-cuda.dir/build.make
	build/tests/CMakeFiles/blas3_solve_float-test-cuda.dir/src/blas3_solve_float-test-cuda_generated_blas3_solve_float.cu.o.cmake
	build/tests/CMakeFiles/external_linkage-cuda.dir/build.make
	build/tests/CMakeFiles/external_linkage-cuda.dir/src/external_linkage-cuda_generated_external_1.cu.o.cmake
	build/tests/CMakeFiles/external_linkage-cuda.dir/src/external_linkage-cuda_generated_external_2.cu.o.cmake
	build/tests/CMakeFiles/global_variables-test-cuda.dir/build.make
	build/tests/CMakeFiles/global_variables-test-cuda.dir/src/global_variables-test-cuda_generated_global_variables.cu.o.cmake
	build/tests/CMakeFiles/iterators-test-cuda.dir/build.make
	build/tests/CMakeFiles/iterators-test-cuda.dir/src/iterators-test-cuda_generated_iterators.cu.o.cmake
	build/tests/CMakeFiles/libviennacl_blas1-test.dir/build.make
	build/tests/CMakeFiles/libviennacl_blas1-test.dir/link.txt
	build/tests/CMakeFiles/libviennacl_blas1-test.dir/src/libviennacl_blas1-test_generated_libviennacl_blas1.cu.o.cmake
	build/tests/CMakeFiles/libviennacl_blas2-test.dir/build.make
	build/tests/CMakeFiles/libviennacl_blas2-test.dir/link.txt
	build/tests/CMakeFiles/libviennacl_blas2-test.dir/src/libviennacl_blas2-test_generated_libviennacl_blas2.cu.o.cmake
	build/tests/CMakeFiles/libviennacl_blas3-test.dir/build.make
	build/tests/CMakeFiles/libviennacl_blas3-test.dir/link.txt
	build/tests/CMakeFiles/libviennacl_blas3-test.dir/src/libviennacl_blas3-test_generated_libviennacl_blas3.cu.o.cmake
	build/tests/CMakeFiles/matrix_col_double-test-cuda.dir/build.make
	build/tests/CMakeFiles/matrix_col_double-test-cuda.dir/src/matrix_col_double-test-cuda_generated_matrix_col_double.cu.o.cmake
	build/tests/CMakeFiles/matrix_col_float-test-cuda.dir/build.make
	build/tests/CMakeFiles/matrix_col_float-test-cuda.dir/src/matrix_col_float-test-cuda_generated_matrix_col_float.cu.o.cmake
	build/tests/CMakeFiles/matrix_col_int-test-cuda.dir/build.make
	build/tests/CMakeFiles/matrix_col_int-test-cuda.dir/src/matrix_col_int-test-cuda_generated_matrix_col_int.cu.o.cmake
	build/tests/CMakeFiles/matrix_row_double-test-cuda.dir/build.make
	build/tests/CMakeFiles/matrix_row_double-test-cuda.dir/src/matrix_row_double-test-cuda_generated_matrix_row_double.cu.o.cmake
	build/tests/CMakeFiles/matrix_row_float-test-cuda.dir/build.make
	build/tests/CMakeFiles/matrix_row_float-test-cuda.dir/src/matrix_row_float-test-cuda_generated_matrix_row_float.cu.o.cmake
	build/tests/CMakeFiles/matrix_row_int-test-cuda.dir/build.make
	build/tests/CMakeFiles/matrix_row_int-test-cuda.dir/src/matrix_row_int-test-cuda_generated_matrix_row_int.cu.o.cmake
	build/tests/CMakeFiles/matrix_vector-test-cuda.dir/build.make
	build/tests/CMakeFiles/matrix_vector-test-cuda.dir/src/matrix_vector-test-cuda_generated_matrix_vector.cu.o.cmake
	build/tests/CMakeFiles/matrix_vector_int-test-cuda.dir/build.make
	build/tests/CMakeFiles/matrix_vector_int-test-cuda.dir/src/matrix_vector_int-test-cuda_generated_matrix_vector_int.cu.o.cmake
	build/tests/CMakeFiles/scalar-test-cuda.dir/build.make
	build/tests/CMakeFiles/scalar-test-cuda.dir/src/scalar-test-cuda_generated_scalar.cu.o.cmake
	build/tests/CMakeFiles/sparse-test-cuda.dir/build.make
	build/tests/CMakeFiles/sparse-test-cuda.dir/src/sparse-test-cuda_generated_sparse.cu.o.cmake
	build/tests/CMakeFiles/spmdm-test-cuda.dir/build.make
	build/tests/CMakeFiles/spmdm-test-cuda.dir/src/spmdm-test-cuda_generated_spmdm.cu.o.cmake
	build/tests/CMakeFiles/vector_double-test-cuda.dir/build.make
	build/tests/CMakeFiles/vector_double-test-cuda.dir/src/vector_double-test-cuda_generated_vector_double.cu.o.cmake
	build/tests/CMakeFiles/vector_float-test-cuda.dir/build.make
	build/tests/CMakeFiles/vector_float-test-cuda.dir/src/vector_float-test-cuda_generated_vector_float.cu.o.cmake
	build/tests/CMakeFiles/vector_int-test-cuda.dir/build.make
	build/tests/CMakeFiles/vector_int-test-cuda.dir/src/vector_int-test-cuda_generated_vector_int.cu.o.cmake
	build/tests/CMakeFiles/vector_multi_inner_prod-test-cuda.dir/build.make
	build/tests/CMakeFiles/vector_multi_inner_prod-test-cuda.dir/src/vector_multi_inner_prod-test-cuda_generated_vector_multi_inner_prod.cu.o.cmake
	build/tests/CMakeFiles/vector_uint-test-cuda.dir/build.make
	build/tests/CMakeFiles/vector_uint-test-cuda.dir/src/vector_uint-test-cuda_generated_vector_uint.cu.o.cmake
	build/tests/Makefile