Commit f84d5e1
committed
Merge branch 'master' into openpiv-master
* master:
added more example images to the multi-pass holder
uploaded 0.20.1
removed test_suite from setup.py
added bumpy to install_requies
updated setup.py
used check-manifest to create a new Manifest.in
moved obsolete files, all tutorials under examples
check-manifest suggests to add these two files
after check-manifest
changed skimage filter to filters
Conflicts:
setup.pyFile tree
75 files changed
+1077
-187
lines changed- docs/src
- openpiv
- docs
- downloads
- images
- src
- generated
- examples
- masking_tutorial
- mutli-pass_tutorial
- tutorial-part1
- test
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
75 files changed
+1077
-187
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
| 1 | + | |
| 2 | + | |
5 | 3 | | |
6 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
This file was deleted.
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
0 commit comments