Commit Graph

4 Commits

Author SHA1 Message Date
Stefan van der Walt 429dedd5c0 Merge branch 'yarik_debian' into debian
Conflicts:
	debian/changelog
	debian/control
	debian/rules
	debian/source/options
2012-05-02 23:23:43 -07:00
Yaroslav Halchenko abf29633e5 PKG: ignore changes in version.py while preparing source package 2012-05-02 23:16:45 -07:00
Yaroslav Halchenko 146c5c9023 adjusted extend-diff-ignore to exclude skimage/version.py 2012-05-02 23:14:00 -07:00
Yaroslav Halchenko 081808d0e5 PKG: ignore changes in version.py while preparing source package 2012-05-02 23:14:00 -07:00