summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiegfried-Angel Gevatter Pujals <rainct@ubuntu.com>2009-07-03 16:22:26 +0200
committerSiegfried-Angel Gevatter Pujals <rainct@ubuntu.com>2009-07-03 16:22:26 +0200
commitf6c5c9933ff3b582064832e33dee9b337b297eb4 (patch)
tree187f7195973fddabaefcf3b6fd1629ac7366dbba
parentea7ab0c7e7d7e120f66e9d7c0e42a35425fbc514 (diff)
downloadzeitgeist-f6c5c9933ff3b582064832e33dee9b337b297eb4.tar.gz
Update COPYRIGHT.
-rw-r--r--COPYRIGHT34
1 files changed, 4 insertions, 30 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 125511d2..60ecc1b9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,38 +1,12 @@
-GNOME Zeitgeist
+Zeitgeist
Copyright © 2008-2009 by the following:
-If you have contributed to this project then you deserve to be on this list.
-Contact us (see: AUTHORS) and we'll add you.
-
Markus Korn <thekorn@gmx.de>
Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com>
Natan Yellin <aantny@gmail.com>
Seif Lotfy <seif@lotfy.com>
Siegfried-Angel Gevatter <rainct@ubuntu.com>
+Alex Graveley <alex@beatniksoftware.com>
-src/zeitgeist_engine/zeitgeist_util.py
-src/zeitgeist_engine/zeitgeist_recent.py
-src/zeitgeist_engine/zeitgeist_tomboy.py
-
-The utility package and RecentlyUsed dataproviders are taken from the Gimmie project.
-The Gimmie homepage is located at http://www.beatniksoftware.com/gimmie.
-
-Copyright © 2007-2009 Alex Graveley <alex@beatniksoftware.com>
-
-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.
+If you have contributed to this project then you deserve to be on this list.
+Contact us (see: AUTHORS) and we'll add you.