diff options
| author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
|---|---|---|
| committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2018-12-17 12:28:45 +0100 |
| commit | c49572a2e90b398e90a43f86b490f27ee6c58de6 (patch) | |
| tree | d130cf7dfc3cf73157e1bece8173331bb4bc7156 /copyright | |
| parent | 0bbc8ab933e62c1fa6d548e879ae6d98cbd461f1 (diff) | |
| parent | cebdc9244c019224846cb8d2668080fe386a6adc (diff) | |
Merge tag 'upstream/0.9.0+dfsg'
Upstream version 0.9.0+dfsg
Diffstat (limited to 'copyright')
| -rw-r--r-- | copyright | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -3,7 +3,7 @@ Upstream-Name: silx Source: https://github.com/silx-kit/silx Files: * -Copyright: 2004-2017 European Synchrotron Radiation Facility +Copyright: 2004-2018 European Synchrotron Radiation Facility Data analysis unit (silx@esrf.fr) License: MIT @@ -20,6 +20,10 @@ Copyright: 2011 Sebastian Wiesner <lunaryorn@gmail.com> Modifications by Charl Botha <cpbotha@vxlabs.com> License: MIT +Files: silx/third_party/modest_image.py +Copyright: 2013 Chris Beaumont +License: MIT + License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), |