Mercurial > pidgin

changeset 28071:1a9e56e2097a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '5d9456311f879116a0aa9a4e39d9262030f2f79e' and 'e2c65b46e0e67251bcbbcb45a18222aca71132bc'
author Paul Aurich <paul@darkrain42.org>
date Sat, 22 Aug 2009 23:33:44 +0000
parents 7cebd7602c6e (current diff) 7921a53b94b3 (diff)
children 74ce58c7bc30 fd2dd4039cb4
files
diffstat 16 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/finch/plugins/grouping.c	Sat Aug 22 22:55:02 2009 +0000
+++ b/finch/plugins/grouping.c	Sat Aug 22 23:33:44 2009 +0000
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 
 #define PURPLE_PLUGIN
--- a/libpurple/protocols/bonjour/bonjour_ft.c	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/bonjour/bonjour_ft.c	Sat Aug 22 23:33:44 2009 +0000
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 #include "internal.h"
 #include "util.h"
--- a/libpurple/protocols/bonjour/bonjour_ft.h	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/bonjour/bonjour_ft.h	Sat Aug 22 23:33:44 2009 +0000
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 #ifndef _BONJOUR_FT_H_
 #define _BONJOUR_FT_H_
--- a/libpurple/protocols/jabber/data.c	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/jabber/data.c	Sat Aug 22 23:33:44 2009 +0000
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include <stdlib.h>
--- a/libpurple/protocols/jabber/data.h	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/jabber/data.h	Sat Aug 22 23:33:44 2009 +0000
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef PURPLE_JABBER_DATA_H
--- a/libpurple/protocols/jabber/ibb.c	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/jabber/ibb.c	Sat Aug 22 23:33:44 2009 +0000
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #include "internal.h"
--- a/libpurple/protocols/jabber/ibb.h	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/jabber/ibb.h	Sat Aug 22 23:33:44 2009 +0000
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
 #ifndef PURPLE_JABBER_IBB_H_
--- a/libpurple/protocols/msn/contact.c	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/msn/contact.c	Sat Aug 22 23:33:44 2009 +0000
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 
 #include "msn.h"
--- a/libpurple/protocols/msn/contact.h	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/msn/contact.h	Sat Aug 22 23:33:44 2009 +0000
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 #ifndef _MSN_CONTACT_H_
 #define _MSN_CONTACT_H_
--- a/libpurple/protocols/msn/oim.c	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/msn/oim.c	Sat Aug 22 23:33:44 2009 +0000
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 #include "msn.h"
 #include "soap.h"
--- a/libpurple/protocols/msn/oim.h	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/msn/oim.h	Sat Aug 22 23:33:44 2009 +0000
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 #ifndef _MSN_OIM_H_
 #define _MSN_OIM_H_
--- a/libpurple/protocols/msn/soap.c	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/msn/soap.c	Sat Aug 22 23:33:44 2009 +0000
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 
 #include "internal.h"
--- a/libpurple/protocols/msn/soap.h	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/msn/soap.h	Sat Aug 22 23:33:44 2009 +0000
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 
 #ifndef _MSN_SOAP_H
--- a/libpurple/protocols/qq/qq_crypt.c	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/qq/qq_crypt.c	Sat Aug 22 23:33:44 2009 +0000
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  *
  *
  * QQ encryption algorithm
--- a/libpurple/protocols/qq/qq_crypt.h	Sat Aug 22 22:55:02 2009 +0000
+++ b/libpurple/protocols/qq/qq_crypt.h	Sat Aug 22 23:33:44 2009 +0000
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 
 #ifndef _QQ_CRYPT_H_
--- a/pidgin/gtkmedia.h	Sat Aug 22 22:55:02 2009 +0000
+++ b/pidgin/gtkmedia.h	Sat Aug 22 23:33:44 2009 +0000
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,  USA
  */
 
 #ifndef __GTKMEDIA_H_