Fixing the license text.

diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index 687345b..10897b2 100644 (file)
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index 7cfa5d3..541b140 100644 (file)
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index a72448c..329304e 100644 (file)
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
index 463dfe8..a437f5a 100644 (file)
--- a/camel/camel-disco-diary.c
+++ b/camel/camel-disco-diary.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
index 80ab205..e2094ad 100644 (file)
--- a/camel/camel-disco-diary.h
+++ b/camel/camel-disco-diary.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c
index ce9465c..eb3d863 100644 (file)
--- a/camel/camel-disco-folder.c
+++ b/camel/camel-disco-folder.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-disco-folder.h b/camel/camel-disco-folder.h
index b128b10..b35c913 100644 (file)
--- a/camel/camel-disco-folder.h
+++ b/camel/camel-disco-folder.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-disco-store.h b/camel/camel-disco-store.h
index 1d1cbd5..575ce1a 100644 (file)
--- a/camel/camel-disco-store.h
+++ b/camel/camel-disco-store.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-exception.c b/camel/camel-exception.c
index 7c24b22..c5eec66 100644 (file)
--- a/camel/camel-exception.c
+++ b/camel/camel-exception.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-exception.h b/camel/camel-exception.h
index 0eaf7a8..77c2c16 100644 (file)
--- a/camel/camel-exception.h
+++ b/camel/camel-exception.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-file-utils.c b/camel/camel-file-utils.c
index 85c2301..9331c64 100644 (file)
--- a/camel/camel-file-utils.c
+++ b/camel/camel-file-utils.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-file-utils.h b/camel/camel-file-utils.h
index 17b7c83..b450637 100644 (file)
--- a/camel/camel-file-utils.h
+++ b/camel/camel-file-utils.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 9bc38df..405107e 100644 (file)
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 4ba36e9..fb98792 100644 (file)
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 05a70f0..b73ca68 100644 (file)
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h
index 7e02223..fc45e1d 100644 (file)
--- a/camel/camel-lock-client.h
+++ b/camel/camel-lock-client.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-lock-helper.c b/camel/camel-lock-helper.c
index 1e7179f..9e5dc01 100644 (file)
--- a/camel/camel-lock-helper.c
+++ b/camel/camel-lock-helper.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-lock-helper.h b/camel/camel-lock-helper.h
index 07307e1..c61a097 100644 (file)
--- a/camel/camel-lock-helper.h
+++ b/camel/camel-lock-helper.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index c9010d6..8faae9f 100644 (file)
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-lock.h b/camel/camel-lock.h
index 55e0bb7..d54f7ed 100644 (file)
--- a/camel/camel-lock.h
+++ b/camel/camel-lock.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-medium.c b/camel/camel-medium.c
index fee9858..2537989 100644 (file)
--- a/camel/camel-medium.c
+++ b/camel/camel-medium.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-medium.h b/camel/camel-medium.h
index 81be789..26040b2 100644 (file)
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 19c24a4..02ed187 100644 (file)
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h
index 3401f91..7e8687a 100644 (file)
--- a/camel/camel-mime-message.h
+++ b/camel/camel-mime-message.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index cff58ce..3bad8de 100644 (file)
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
index 516e147..576f7bd 100644 (file)
--- a/camel/camel-mime-part-utils.h
+++ b/camel/camel-mime-part-utils.h
@@ -11,7 +11,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index efb4cee..637973a 100644 (file)
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h
index 605bf1d..785fecf 100644 (file)
--- a/camel/camel-mime-part.h
+++ b/camel/camel-mime-part.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
index b8d0711..c4f22b6 100644 (file)
--- a/camel/camel-movemail.c
+++ b/camel/camel-movemail.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h
index a5d5207..3e5206f 100644 (file)
--- a/camel/camel-movemail.h
+++ b/camel/camel-movemail.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index 83cafbd..a9e95c2 100644 (file)
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -14,7 +14,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h
index aa2f87a..dfa8908 100644 (file)
--- a/camel/camel-multipart.h
+++ b/camel/camel-multipart.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-object.c b/camel/camel-object.c
index 9e508c0..6d8b301 100644 (file)
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-object.h b/camel/camel-object.h
index b8f2e14..63f3520 100644 (file)
--- a/camel/camel-object.h
+++ b/camel/camel-object.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-operation.h b/camel/camel-operation.h
index 4b6a608..08da410 100644 (file)
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-private.h b/camel/camel-private.h
index f3986cb..c6a3157 100644 (file)
--- a/camel/camel-private.h
+++ b/camel/camel-private.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index 7f1d3b0..68ceccb 100644 (file)
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -12,7 +12,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 8a13e5a..9269745 100644 (file)
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -11,7 +11,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-remote-store.h b/camel/camel-remote-store.h
index 5b21ad0..a596ed7 100644 (file)
--- a/camel/camel-remote-store.h
+++ b/camel/camel-remote-store.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
index 78b979e..874d68e 100644 (file)
--- a/camel/camel-seekable-stream.c
+++ b/camel/camel-seekable-stream.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h
index 8c3cb61..9ac73c7 100644 (file)
--- a/camel/camel-seekable-stream.h
+++ b/camel/camel-seekable-stream.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c
index e15714f..c51b52b 100644 (file)
--- a/camel/camel-seekable-substream.c
+++ b/camel/camel-seekable-substream.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 871f2a5..897342c 100644 (file)
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-service.c b/camel/camel-service.c
index e0304f2..ade9a1d 100644 (file)
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-service.h b/camel/camel-service.h
index fd34d14..98d3de4 100644 (file)
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-session.c b/camel/camel-session.c
index 061c62a..bcd6802 100644 (file)
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -11,7 +11,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-session.h b/camel/camel-session.h
index 583339d..00083fc 100644 (file)
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-store.c b/camel/camel-store.c
index f4b15a0..c6ffdcd 100644 (file)
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-store.h b/camel/camel-store.h
index 157bc19..6b66811 100644 (file)
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index 8695a5d..ff7df17 100644 (file)
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
index 5d0244d..db93971 100644 (file)
--- a/camel/camel-stream-buffer.h
+++ b/camel/camel-stream-buffer.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 7fb43aa..230d3ba 100644 (file)
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h
index eb1cc5b..7db13ac 100644 (file)
--- a/camel/camel-stream-fs.h
+++ b/camel/camel-stream-fs.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
index 5e491f2..d81b304 100644 (file)
--- a/camel/camel-stream-mem.c
+++ b/camel/camel-stream-mem.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h
index 011c540..af51c36 100644 (file)
--- a/camel/camel-stream-mem.h
+++ b/camel/camel-stream-mem.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-stream-null.c b/camel/camel-stream-null.c
index 1519fb7..3c0fdee 100644 (file)
--- a/camel/camel-stream-null.c
+++ b/camel/camel-stream-null.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-stream.c b/camel/camel-stream.c
index fe35c41..709bfe1 100644 (file)
--- a/camel/camel-stream.c
+++ b/camel/camel-stream.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index c0a4a05..f75e882 100644 (file)
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-transport.c b/camel/camel-transport.c
index 33f2268..0dc56a8 100644 (file)
--- a/camel/camel-transport.c
+++ b/camel/camel-transport.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-transport.h b/camel/camel-transport.h
index 5b50eb0..5951d11 100644 (file)
--- a/camel/camel-transport.h
+++ b/camel/camel-transport.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-types.h b/camel/camel-types.h
index ec63948..6765424 100644 (file)
--- a/camel/camel-types.h
+++ b/camel/camel-types.h
@@ -5,7 +5,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c
index 48bfa98..933f8b6 100644 (file)
--- a/camel/camel-uid-cache.c
+++ b/camel/camel-uid-cache.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h
index 072e036..e4327c9 100644 (file)
--- a/camel/camel-uid-cache.h
+++ b/camel/camel-uid-cache.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-url.c b/camel/camel-url.c
index ea707b3..a2d4e73 100644 (file)
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -11,7 +11,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel-url.h b/camel/camel-url.h
index 5672442..d60c959 100644 (file)
--- a/camel/camel-url.h
+++ b/camel/camel-url.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel.c b/camel/camel.c
index 05daa30..2bdc67b 100644 (file)
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/camel.h b/camel/camel.h
index 4fd01a6..07d0cb9 100644 (file)
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/gstring-util.c b/camel/gstring-util.c
index 6cb6b3c..e0d404a 100644 (file)
--- a/camel/gstring-util.c
+++ b/camel/gstring-util.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/gstring-util.h b/camel/gstring-util.h
index 1d60aef..39fdf32 100644 (file)
--- a/camel/gstring-util.h
+++ b/camel/gstring-util.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/hash-table-utils.c b/camel/hash-table-utils.c
index 35a6425..f17f6ce 100644 (file)
--- a/camel/hash-table-utils.c
+++ b/camel/hash-table-utils.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/hash-table-utils.h b/camel/hash-table-utils.h
index f977271..80e9a60 100644 (file)
--- a/camel/hash-table-utils.h
+++ b/camel/hash-table-utils.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
index da7ce3f..69c2823 100644 (file)
--- a/camel/providers/imap/camel-imap-command.h
+++ b/camel/providers/imap/camel-imap-command.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 6df3833..e1bd4bc 100644 (file)
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index 888c5d8..05e46ce 100644 (file)
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c
index 1758377..ab5d125 100644 (file)
--- a/camel/providers/imap/camel-imap-message-cache.c
+++ b/camel/providers/imap/camel-imap-message-cache.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-message-cache.h b/camel/providers/imap/camel-imap-message-cache.h
index 5f05e33..efdc832 100644 (file)
--- a/camel/providers/imap/camel-imap-message-cache.h
+++ b/camel/providers/imap/camel-imap-message-cache.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h
index 187b145..07b790c 100644 (file)
--- a/camel/providers/imap/camel-imap-private.h
+++ b/camel/providers/imap/camel-imap-private.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index adbbf7b..66ebe13 100644 (file)
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-types.h b/camel/providers/imap/camel-imap-types.h
index 9714fd2..c5ea41a 100644 (file)
--- a/camel/providers/imap/camel-imap-types.h
+++ b/camel/providers/imap/camel-imap-types.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index f75c707..53646bb 100644 (file)
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h
index f0b6cef..4f7ca50 100644 (file)
--- a/camel/providers/imap/camel-imap-wrapper.h
+++ b/camel/providers/imap/camel-imap-wrapper.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 985081a..6077a66 100644 (file)
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
index cb4cabe..3eb4b02 100644 (file)
--- a/camel/providers/local/camel-local-folder.h
+++ b/camel/providers/local/camel-local-folder.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
index d193524..4dfe9f6 100644 (file)
--- a/camel/providers/local/camel-local-private.h
+++ b/camel/providers/local/camel-local-private.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
index a5bb651..f4a4301 100644 (file)
--- a/camel/providers/local/camel-local-provider.c
+++ b/camel/providers/local/camel-local-provider.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 9124942..918b8db 100644 (file)
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
index 3c8eb35..21d854c 100644 (file)
--- a/camel/providers/local/camel-local-store.h
+++ b/camel/providers/local/camel-local-store.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index e786833..fc9ab99 100644 (file)
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-maildir-folder.h b/camel/providers/local/camel-maildir-folder.h
index 6e93aa4..c495d9b 100644 (file)
--- a/camel/providers/local/camel-maildir-folder.h
+++ b/camel/providers/local/camel-maildir-folder.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index ae06d37..4d754e5 100644 (file)
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h
index 9882485..f7725bc 100644 (file)
--- a/camel/providers/local/camel-maildir-store.h
+++ b/camel/providers/local/camel-maildir-store.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 7f1162d..534269d 100644 (file)
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h
index fa521f9..aa0b672 100644 (file)
--- a/camel/providers/local/camel-mbox-folder.h
+++ b/camel/providers/local/camel-mbox-folder.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index 280e9d0..f401632 100644 (file)
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h
index 6cce475..5b6fbdd 100644 (file)
--- a/camel/providers/local/camel-mbox-store.h
+++ b/camel/providers/local/camel-mbox-store.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 109d123..6795ab3 100644 (file)
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h
index 544ef27..125f8c8 100644 (file)
--- a/camel/providers/local/camel-mh-folder.h
+++ b/camel/providers/local/camel-mh-folder.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index dd44f01..8b8c2e5 100644 (file)
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h
index f83404f..b69bddb 100644 (file)
--- a/camel/providers/local/camel-mh-store.h
+++ b/camel/providers/local/camel-mh-store.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index afec083..298f044 100644 (file)
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-spool-folder.h b/camel/providers/local/camel-spool-folder.h
index 04a79b2..717ec4a 100644 (file)
--- a/camel/providers/local/camel-spool-folder.h
+++ b/camel/providers/local/camel-spool-folder.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index c16d106..fdf5640 100644 (file)
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h
index 74a8495..677f6aa 100644 (file)
--- a/camel/providers/local/camel-spool-store.h
+++ b/camel/providers/local/camel-spool-store.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
index b3f7882..f8d3a62 100644 (file)
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ b/camel/providers/nntp/camel-nntp-auth.c
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
index 67636db..fc96cf6 100644 (file)
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ b/camel/providers/nntp/camel-nntp-auth.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 1de28c1..9f291d9 100644 (file)
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
index 6acbf09..223323c 100644 (file)
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ b/camel/providers/nntp/camel-nntp-folder.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
index ff2bf7b..7f3850f 100644 (file)
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ b/camel/providers/nntp/camel-nntp-grouplist.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
index 6ee18a5..edd1e64 100644 (file)
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ b/camel/providers/nntp/camel-nntp-grouplist.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
index 3e0d0ac..8c7ef1d 100644 (file)
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ b/camel/providers/nntp/camel-nntp-newsrc.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index e529c9b..773e3d7 100644 (file)
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
index 6c00c57..d9aace8 100644 (file)
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ b/camel/providers/nntp/camel-nntp-resp-codes.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index c2ee463..9ff097f 100644 (file)
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index 02cca63..0f373dd 100644 (file)
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
index 81cc334..a37179c 100644 (file)
--- a/camel/providers/nntp/camel-nntp-types.h
+++ b/camel/providers/nntp/camel-nntp-types.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index 46dac10..5f26d71 100644 (file)
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
index 7d648bf..48fd749 100644 (file)
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ b/camel/providers/nntp/camel-nntp-utils.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 0801d6d..5452144 100644 (file)
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h
index 15a2958..0b6296a 100644 (file)
--- a/camel/providers/pop3/camel-pop3-folder.h
+++ b/camel/providers/pop3/camel-pop3-folder.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 91b9a94..9e7a022 100644 (file)
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 42a3579..e959aa2 100644 (file)
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
index 8981484..fcc488f 100644 (file)
--- a/camel/providers/pop3/camel-pop3-store.h
+++ b/camel/providers/pop3/camel-pop3-store.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 4f0ad07..4d546a0 100644 (file)
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index f218dac..28bc488 100644 (file)
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
index 74b5881..056be03 100644 (file)
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ b/camel/providers/sendmail/camel-sendmail-transport.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 9c25186..13f0cb6 100644 (file)
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 2b35f49..c37b35c 100644 (file)
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h
index dba6369..7a6b631 100644 (file)
--- a/camel/providers/smtp/camel-smtp-transport.h
+++ b/camel/providers/smtp/camel-smtp-transport.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/string-utils.c b/camel/string-utils.c
index 0331d62..1e2fa10 100644 (file)
--- a/camel/string-utils.c
+++ b/camel/string-utils.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/camel/string-utils.h b/camel/string-utils.h
index 7b4e900..0402eb1 100644 (file)
--- a/camel/string-utils.h
+++ b/camel/string-utils.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,

diff --git a/libedataserverui/e-passwords.c b/libedataserverui/e-passwords.c
index 6cc216c..bf632c2 100644 (file)
--- a/libedataserverui/e-passwords.c
+++ b/libedataserverui/e-passwords.c
@@ -9,7 +9,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,

diff --git a/libedataserverui/e-passwords.h b/libedataserverui/e-passwords.h
index a5c7b5e..aad7e85 100644 (file)
--- a/libedataserverui/e-passwords.h
+++ b/libedataserverui/e-passwords.h
@@ -7,7 +7,6 @@
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,