diff options
| author | Oscar Villellas <oscar.villellas@continuum.io> | 2017-01-03 20:28:00 +0100 |
|---|---|---|
| committer | Oscar Villellas <oscar.villellas@continuum.io> | 2017-01-03 20:28:00 +0100 |
| commit | 4c93e28685eecfd359f7ca9ad6f8003f054626ca (patch) | |
| tree | 91b81599f615d45e7103d55daf69b25d19eabe4a /LICENSE.txt | |
| parent | f555826ac776e0866e1edfc1804c88c2a23dab3b (diff) | |
| parent | 02e2ea815a6c76152096364edd10e2dd954bcb56 (diff) | |
| download | numpy-4c93e28685eecfd359f7ca9ad6f8003f054626ca.tar.gz | |
Merge remote-tracking branch 'numpy-org/master' into mult-norm
Diffstat (limited to 'LICENSE.txt')
| -rw-r--r-- | LICENSE.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index b4139af86..9014534ab 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2005-2015, NumPy Developers. +Copyright (c) 2005-2016, NumPy Developers. All rights reserved. Redistribution and use in source and binary forms, with or without |