# HG changeset patch
# User SHiNE CsyFeK <csyfek@gmail.com>
# Date 1235539148 0
# Node ID 7f736195a20b8fc562d58e247f45b28629a20953
# Parent  69dae1012aee9d41d314383c7446de740aa13e24# Parent  b16a35e21a3daa953e50da9d82c62270d4ba7837
merge of '0255e37442effe291a919a71184e1266f5e9480f'
     and 'aa8d51d876db3c7b506532cfa56b1de628c31895'

diff -r 69dae1012aee -r 7f736195a20b libpurple/protocols/qq/ChangeLog
--- a/libpurple/protocols/qq/ChangeLog	Wed Feb 25 02:26:33 2009 +0000
+++ b/libpurple/protocols/qq/ChangeLog	Wed Feb 25 05:19:08 2009 +0000
@@ -1,3 +1,6 @@
+2009.02.24 - flos <lonicerae(at)gmail.com>
+	* NEVER forget our COPYRIGHT, ;)
+
 2009.02.24 - flos <lonicerae(at)gmail.com>
 	* Changed update_class type from gint to guint32
 	* Fixed a bug of displaying of memo when memo is nothing
diff -r 69dae1012aee -r 7f736195a20b libpurple/protocols/qq/buddy_memo.c
--- a/libpurple/protocols/qq/buddy_memo.c	Wed Feb 25 02:26:33 2009 +0000
+++ b/libpurple/protocols/qq/buddy_memo.c	Wed Feb 25 05:19:08 2009 +0000
@@ -1,3 +1,27 @@
+/**
+ * @file buddy_memo.c
+ *
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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
+ */
+
 #include "internal.h"
 #include "debug.h"
 #include "notify.h"
diff -r 69dae1012aee -r 7f736195a20b libpurple/protocols/qq/buddy_memo.h
--- a/libpurple/protocols/qq/buddy_memo.h	Wed Feb 25 02:26:33 2009 +0000
+++ b/libpurple/protocols/qq/buddy_memo.h	Wed Feb 25 05:19:08 2009 +0000
@@ -1,3 +1,27 @@
+/**
+ * @file buddy_memo.h
+ *
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * 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 _QQ_BUDDY_MEMO_H_
 #define _QQ_BUDDY_MEMO_H_