changeset 24036:9975c61eeb69

merge of '3899adf4bc769e54b5338f295574ed8389025068' and 'ffa776d4a76c39b04bbb031ff24e92e3712a1f8b'
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 11 Sep 2008 21:25:05 +0000
parents 1efbc28b5042 (diff) f5b03b4536bb (current diff)
children 1fb2e7951f9b
files
diffstat 2 files changed, 30 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo_auth.c	Thu Sep 11 21:16:07 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo_auth.c	Thu Sep 11 21:25:05 2008 +0000
@@ -1,9 +1,22 @@
 /*
  * yahoo_auth.c: Authentication routines.
- *	
+ *
  * Written by Kevin Kurtz and Scott Werndorfer
+ * Copyright(c) 2003 Cerulean Studios
  *
- * Copyright(c) 2003 Cerulean Studios
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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  02111-1301  USA
  *
  */
 
--- a/libpurple/protocols/yahoo/yahoo_auth.h	Thu Sep 11 21:16:07 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo_auth.h	Thu Sep 11 21:25:05 2008 +0000
@@ -2,6 +2,21 @@
  * yahoo_auth.h: Header for Yahoo Messenger authentication schemes.  Eew.
  *
  * Copyright(c) 2003 Cerulean Studios
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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  02111-1301  USA
+ *
  */
 
 #ifndef _YAHOO_AUTH_H_