# HG changeset patch # User Paul Aurich # Date 1250984024 0 # Node ID 1a9e56e2097a0c121352edbb2e17eb773d16c7cf # Parent 7cebd7602c6ec11fc3e9d8b5070ba37b7ac3f21b# Parent 7921a53b94b3bc64c7e76dd42260fa4c4141120b merge of '5d9456311f879116a0aa9a4e39d9262030f2f79e' and 'e2c65b46e0e67251bcbbcb45a18222aca71132bc' diff -r 7cebd7602c6e -r 1a9e56e2097a finch/plugins/grouping.c --- 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 diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/bonjour/bonjour_ft.c --- 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" diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/bonjour/bonjour_ft.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_ diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/jabber/data.c --- 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 diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/jabber/data.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 diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/jabber/ibb.c --- 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" diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/jabber/ibb.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_ diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/msn/contact.c --- 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" diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/msn/contact.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_ diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/msn/oim.c --- 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" diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/msn/oim.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_ diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/msn/soap.c --- 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" diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/msn/soap.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 diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/qq/qq_crypt.c --- 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 diff -r 7cebd7602c6e -r 1a9e56e2097a libpurple/protocols/qq/qq_crypt.h --- 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_ diff -r 7cebd7602c6e -r 1a9e56e2097a pidgin/gtkmedia.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_