Skip to content

Commit

Permalink
Merge pull request #6 from OpenPIV/master
Browse files Browse the repository at this point in the history
merge the updates through openpiv repository
  • Loading branch information
alexlib committed Jul 20, 2015
2 parents ce4c8dc + a8f2851 commit 20f9036
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
sudo: false
os:
- linux
- osx

sudo: false

language: python

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# OpenPIV
[![Build Status](https://travis-ci.org/OpenPIV/openpiv-python.svg?branch=master)](https://travis-ci.org/OpenPIV/openpiv-python)

OpenPIV consists in a Python and Cython modules for scripting and executing the analysis of
a set of PIV image pairs. In addition, a Qt graphical user interface is in
Expand Down Expand Up @@ -57,5 +58,3 @@ The OpenPIV documentation is available on the project web page at <http://openpi
4. David Lasagna
5. Mathias Aubert


[![Build Status](https://travis-ci.org/alexlib/openpiv-python.svg)](https://travis-ci.org/alexlib/openpiv-python)

0 comments on commit 20f9036

Please sign in to comment.