changeset 31782:727edf2625f5

Patch up merge
author Ethan Blanton <elb@pidgin.im>
date Thu, 11 Aug 2011 14:45:26 +0000
parents ac43f26c7f61
children 32ef245fd1f6 98ae4b8b592f
files ChangeLog
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 11 14:44:44 2011 +0000
+++ b/ChangeLog	Thu Aug 11 14:45:26 2011 +0000
@@ -11,8 +11,6 @@
 
 	libpurple:
 	* Fix a potential crash in the Log Reader plugin when reading QIP logs.
-
-	Libpurple:
 	* Fix a large number of strcpy() and strcat() invocations to use
 	  strlcpy() and strlcat(), etc., forestalling an entire class of
 	  string buffer overrun bugs.