Permalink
Browse files

Updated license to MIT.

  • Loading branch information...
1 parent 30e9c4c commit 5b48d98f40abe40509ba354d6dff559e6fad892f Matthew Loper committed Jul 11, 2014
Showing with 18 additions and 23 deletions.
  1. +18 −8 LICENSE.txt
  2. +0 −1 api_compatibility.py
  3. +0 −1 ch.py
  4. +0 −1 ch_ops.py
  5. +0 −1 ch_random.py
  6. +0 −1 linalg.py
  7. +0 −1 logic.py
  8. +0 −1 optimization.py
  9. +0 −1 reordering.py
  10. +0 −1 setup.py
  11. +0 −1 test_ch/test_ch.py
  12. +0 −1 test_ch/test_inner_composition.py
  13. +0 −1 test_ch/test_linalg.py
  14. +0 −1 test_ch/test_optimization.py
  15. +0 −1 test_ch/test_performance.py
  16. +0 −1 utils.py
View
@@ -1,11 +1,21 @@
-Chumpy: differentiable Numpy
-Copyright (c) Matthew Loper <matt.loper@gmail.com>
+The MIT License (MIT)
-Permission is hereby granted to Max-Planck employees and researchers
-for the use and modification (but not redistribution) of this software
-for research purposes.
+Copyright (c) 2014 Max-Planck-Gesellschaft
-This software is also licensed separately and non-exclusively to Body
-Labs, Inc, according to a 2013 licensing agreement with the Max Planck Institute.
-Terms of that agreement are available on request.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -1,5 +1,4 @@
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -1,5 +1,4 @@
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -2,7 +2,6 @@
# encoding: utf-8
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -1,5 +1,4 @@
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -1,7 +1,6 @@
#!/usr/bin/env python
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -1,5 +1,4 @@
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -1,5 +1,4 @@
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.
View
@@ -1,5 +1,4 @@
"""
-Copyright (C) 2013
Author(s): Matthew Loper
See LICENCE.txt for licensing and contact information.

0 comments on commit 5b48d98

Please sign in to comment.