aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2010-08-10 11:16:39 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2010-08-10 11:16:39 +0000
commitd0de4908b380fcc4be6ae3f9184f1359f4ca152c (patch)
tree36cfc6015eae0f96701d0f49d8b683dbd58098f5
parent45e43a56028e831ee642362607439656965e3927 (diff)
downloadqxmpp-d0de4908b380fcc4be6ae3f9184f1359f4ca152c.tar.gz
cleanup licensing
-rw-r--r--AUTHORS10
-rw-r--r--source/server/QXmppClientServer.cpp2
-rw-r--r--source/server/QXmppClientServer.h2
-rw-r--r--source/server/QXmppServer.cpp2
-rw-r--r--source/server/QXmppServer.h2
-rw-r--r--source/server/QXmppServerConnection.cpp2
-rw-r--r--source/server/QXmppServerConnection.h2
7 files changed, 14 insertions, 8 deletions
diff --git a/AUTHORS b/AUTHORS
index f80ffbb3..af5649a8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,11 +2,17 @@ QXMPP AUTHORS
-------------
Manjeet Dahiya <manjeetdahiya@gmail.com>
- * Initial author of QXmpp
+ * Initial author of QXmpp.
Jeremy Lainé <jeremy.laine@m4x.org>
- * Co-maintainer of QXmpp
+ * Co-author of QXmpp.
Ian Reinhart Geiser <geiseri@kde.org>
* Initial author of Jabber-RPC support.
+Sjors Gielen
+ * Co-author of server-side code.
+
+Rob ten Berge
+ * Co-author of server-side code.
+
diff --git a/source/server/QXmppClientServer.cpp b/source/server/QXmppClientServer.cpp
index 6e0c4dd4..7e74f8d8 100644
--- a/source/server/QXmppClientServer.cpp
+++ b/source/server/QXmppClientServer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Sjors Gielen, Manjeet Dahiya
+ * Copyright (C) 2008-2010 The QXmpp developers
*
* Authors:
* Manjeet Dahiya
diff --git a/source/server/QXmppClientServer.h b/source/server/QXmppClientServer.h
index 3c5fd884..4f7e4c66 100644
--- a/source/server/QXmppClientServer.h
+++ b/source/server/QXmppClientServer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Sjors Gielen, Manjeet Dahiya
+ * Copyright (C) 2008-2010 The QXmpp developers
*
* Authors:
* Manjeet Dahiya
diff --git a/source/server/QXmppServer.cpp b/source/server/QXmppServer.cpp
index 9d7fd89e..b402a3cc 100644
--- a/source/server/QXmppServer.cpp
+++ b/source/server/QXmppServer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Sjors Gielen
+ * Copyright (C) 2008-2010 The QXmpp developers
*
* Author:
* Sjors Gielen
diff --git a/source/server/QXmppServer.h b/source/server/QXmppServer.h
index 06c8ab03..6cc6597b 100644
--- a/source/server/QXmppServer.h
+++ b/source/server/QXmppServer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Sjors Gielen, Rob ten Berge
+ * Copyright (C) 2008-2010 The QXmpp developers
*
* Authors:
* Sjors Gielen
diff --git a/source/server/QXmppServerConnection.cpp b/source/server/QXmppServerConnection.cpp
index 1a0cf828..09993e2c 100644
--- a/source/server/QXmppServerConnection.cpp
+++ b/source/server/QXmppServerConnection.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Sjors Gielen, Manjeet Dahiya
+ * Copyright (C) 2008-2010 The QXmpp developers
*
* Authors:
* Manjeet Dahiya
diff --git a/source/server/QXmppServerConnection.h b/source/server/QXmppServerConnection.h
index 2a7d4a66..aa685dc8 100644
--- a/source/server/QXmppServerConnection.h
+++ b/source/server/QXmppServerConnection.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Sjors Gielen, Manjeet Dahiya
+ * Copyright (C) 2008-2010 The QXmpp developers
*
* Authors:
* Manjeet Dahiya