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/StringCodecs/MD5.cpp
parent0313b451afbeffc33cc0060ce6fd7b4f2ee9a2bb (diff)
parentf2637331516790242317997ca099e1bc1901c935 (diff)
downloadswift-d53ceecb25f336fd1e7e5d9a6ae52599ff2cb12b.zip
swift-d53ceecb25f336fd1e7e5d9a6ae52599ff2cb12b.tar.bz2
Merge branch 'copyrights'
Diffstat (limited to 'Swiften/StringCodecs/MD5.cpp')
-rw-r--r--Swiften/StringCodecs/MD5.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/Swiften/StringCodecs/MD5.cpp b/Swiften/StringCodecs/MD5.cpp
index 937d128..09c3a42 100644
--- a/Swiften/StringCodecs/MD5.cpp
+++ b/Swiften/StringCodecs/MD5.cpp
@@ -1,10 +1,14 @@
-/*
- * This implementation is shamelessly copied from L. Peter Deutsch's
- * implementation, and altered to use our own defines and datastructures.
- * Original license below.
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
*/
/*
+ * This implementation is shamelessly copied from L. Peter Deutsch's
+ * implementation, and altered to use our own defines and datastructures.
+ * Original license below.
+ *//*
Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved.
This software is provided 'as-is', without any express or implied