Skip to content
Browse files

Updated README and LICENSE

  • Loading branch information...
1 parent 5a9815b commit d46073156bfbd156dfa2d36fd37ad427b03ffb14 @tsileo committed Oct 1, 2013
Showing with 11 additions and 3 deletions.
  1. +7 −0 LICENSE
  2. +1 −1 MANIFEST.in
  3. +3 −2 README.rst
View
7 LICENSE
@@ -0,0 +1,7 @@
+Copyright (c) 2013 Thomas Sileo and Steven Buss
+
+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.
View
2 MANIFEST.in
@@ -1 +1 @@
-include README.rst
+include README.rst LICENSE
View
5 README.rst
@@ -134,19 +134,20 @@ Changelog
0.2.0
-----
-**September 30 2013**
+**Not released yet**
- Cleaned code (PEP8)
- Compatible with requests 2.0
- Added metric resolution shortcut
- Added a ``Event`` helper
+- Merged some parts of `sbuss/pypercube <https://github.com/sbuss/pypercube>`_, ``EventExpression`` and ``Filter``.
License (MIT)
=============
-Copyright (c) 2012 Thomas Sileo
+Copyright (c) 2012 Thomas Sileo and Steven Buss
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:

0 comments on commit d460731

Please sign in to comment.
Something went wrong with that request. Please try again.