Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/logcollect.py
diff options
context:
space:
mode:
authorOLPC Developer <olpc@olpcdev.localdomain>2007-11-05 07:09:42 (GMT)
committer OLPC Developer <olpc@olpcdev.localdomain>2007-11-05 07:09:42 (GMT)
commit30f34264c9c112d43d6b43bbc91ea6ccee1d2720 (patch)
tree77c361f655fcf4924834ccfeb6b57fe59547275a /logcollect.py
parent0c07371f4ef46b21c39999dce98843cee4d251a9 (diff)
Relicense logcollect.py MIT
Diffstat (limited to 'logcollect.py')
-rw-r--r--logcollect.py33
1 files changed, 20 insertions, 13 deletions
diff --git a/logcollect.py b/logcollect.py
index 0380c37..706ba64 100644
--- a/logcollect.py
+++ b/logcollect.py
@@ -1,20 +1,27 @@
#!/usr/bin/env python
-# Copyright (C) 2006-2007, Pascal Scheffers <pascal@scheffers.net>
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# Copyright (C) 2007, Pascal Scheffers <pascal@scheffers.net>
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# 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:
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
+# 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.
#
# log-collect for OLPC
#