From 32f38cc3b6cdfb22c04c438bda59374fb8211f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 8 Apr 2010 20:38:26 +0200
Subject: Fix bug in copyrighter script that handled MD5 copyright incorrectly.


diff --git a/BuildTools/Copyrighter.py b/BuildTools/Copyrighter.py
index 0016037..56e6be9 100755
--- a/BuildTools/Copyrighter.py
+++ b/BuildTools/Copyrighter.py
@@ -61,11 +61,11 @@ def parse_file(filename) :
       if re.match(get_comment_chars_re_for_filename(filename), line) != None :
         copyright_text.append(line.rstrip())
         continue
-      elif len(line.strip()) == 0 :
-        continue
       else :
         inCopyright = False
         inEpilog = True
+        if len(line.strip()) == 0 :
+          continue
 
     if inEpilog :
       epilog += line
diff --git a/Swiften/StringCodecs/MD5.cpp b/Swiften/StringCodecs/MD5.cpp
index 1a06f20..09c3a42 100644
--- a/Swiften/StringCodecs/MD5.cpp
+++ b/Swiften/StringCodecs/MD5.cpp
@@ -5,16 +5,13 @@
  */
 
 /*
- * 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
+ *//*
+	Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+	This software is provided 'as-is', without any express or implied
 	warranty.  In no event will the authors be held liable for any damages
 	arising from the use of this software.
 
-- 
cgit v0.10.2-6-g49f6