summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-04-08 19:10:45 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-04-08 19:10:45 (GMT)
commitd53ceecb25f336fd1e7e5d9a6ae52599ff2cb12b (patch)
treebc59b7ea1adf2b94c1594dfd74d7f9353386e133 /Swiften/Disco
parent0313b451afbeffc33cc0060ce6fd7b4f2ee9a2bb (diff)
parentf2637331516790242317997ca099e1bc1901c935 (diff)
downloadswift-d53ceecb25f336fd1e7e5d9a6ae52599ff2cb12b.zip
swift-d53ceecb25f336fd1e7e5d9a6ae52599ff2cb12b.tar.bz2
Merge branch 'copyrights'
Diffstat (limited to 'Swiften/Disco')
-rw-r--r--Swiften/Disco/CapsInfoGenerator.cpp6
-rw-r--r--Swiften/Disco/CapsInfoGenerator.h6
-rw-r--r--Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp6
3 files changed, 18 insertions, 0 deletions
diff --git a/Swiften/Disco/CapsInfoGenerator.cpp b/Swiften/Disco/CapsInfoGenerator.cpp
index 8d9e407..67ed979 100644
--- a/Swiften/Disco/CapsInfoGenerator.cpp
+++ b/Swiften/Disco/CapsInfoGenerator.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
#include "Swiften/Disco/CapsInfoGenerator.h"
#include <algorithm>
diff --git a/Swiften/Disco/CapsInfoGenerator.h b/Swiften/Disco/CapsInfoGenerator.h
index 66949ab..d69c05e 100644
--- a/Swiften/Disco/CapsInfoGenerator.h
+++ b/Swiften/Disco/CapsInfoGenerator.h
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
#ifndef SWIFTEN_CapsInfoGenerator_H
#define SWIFTEN_CapsInfoGenerator_H
diff --git a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
index 94b9913..a8fe5b7 100644
--- a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
+++ b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>