Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
Incorporating edits from the README file made to /master

Conflicts:
	README.md
  • Loading branch information
Kent Knox committed Jul 22, 2015
2 parents 06d3352 + aa92176 commit 1e10b3c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Pre-built binaries are available on our [releases page](releases)

# clSPARSE
an OpenCL© library implementing sparse linear algebra. This project started
as a collaboration between [AMD Inc.](http://www.amd.com/) and
an OpenCL© library implementing Sparse linear algebra. This project is a result of
a collaboration between [AMD Inc.](http://www.amd.com/) and
[Vratis Ltd.](http://www.vratis.com/).

## Introduction to clSPARSE
Expand Down

0 comments on commit 1e10b3c

Please sign in to comment.