wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-08-15 12:54:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'yarik_debian' into debian

Browse Source 
Conflicts:
	debian/changelog
	debian/control
	debian/rules
	debian/source/options
This commit is contained in:
Stefan van der Walt
2012-05-02 23:23:43 -07:00
parent 5ffa53b92e 93a983cb08
commit 429dedd5c0
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/source/options
Vendored
+2 -1
View File
@@ -1,2 +1,3 @@
# Do not generate diff for version.py which gets updated by setup.py
extend-diff-ignore = "(^|/)scikits/image/version.py$"
extend-diff-ignore = "(^|/)skimage/version.py$"