[viennacl] 02/04: Merge tag 'upstream/1.5.2'

[Toby St Clere Smithe]

This is an automated email from the git hooks/post-receive script.

tsmithe-guest pushed a commit to branch master
in repository viennacl.

commit 9ed4b713ab00033350ea78c2bb8bfb0996b4206a
Merge: af9b419 15d0b5a
Author: Toby Smithe <git at tsmithe.net>
Date:   Fri May 16 11:43:27 2014 +0100

    Merge tag 'upstream/1.5.2'
    
    Upstream version 1.5.2
    
    Conflicts:
    	CMakeLists.txt
    	README
    	doc/Doxyfile.in
    	doc/manual/cover.tex
    	doc/manual/viennacl.tex
    	viennacl/forwards.h

 CMakeLists.txt                                   |  2 +-
 README                                           |  6 ++--
 changelog                                        |  9 ++++-
 doc/Doxyfile.in                                  |  2 +-
 doc/manual/changelogs.tex                        | 10 ++++++
 doc/manual/cover.tex                             |  2 +-
 doc/manual/viennacl.tex                          |  4 +--
 viennacl/forwards.h                              |  2 +-
 viennacl/generator/profiles.hpp                  | 23 +++++++++++++
 viennacl/linalg/detail/ilu/block_ilu.hpp         |  4 +--
 viennacl/linalg/vector_operations.hpp            | 23 +++++++++++++
 viennacl/ocl/device.hpp                          | 44 ++++++++++++++++++++++++
 viennacl/ocl/infos.hpp                           |  4 +++
 viennacl/scheduler/execute.hpp                   |  4 +++
 viennacl/scheduler/execute_matrix_dispatcher.hpp | 44 ++++++++++++++++++++++++
 viennacl/vector.hpp                              | 22 ------------
 16 files changed, 171 insertions(+), 34 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/viennacl.git