# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1081399433 0
# Node ID 70aad91d9cb5ea377867a4d5e3679298e8534d15
# Parent  9bd849b376b467b7f380d83b6410b4a5bd72df4d
[gaim-migrate @ 9369]
(00:55:17) JBSilvest: oh, btw, the other part of my Changelog.diff was to
capitalize the first letter of the prior entry...it wasn't completely
pointless
(00:55:30) Luke: your diff didn't apply
(00:55:37) JBSilvest: oh, right
(00:55:37) Luke: cause i'd already fixed one mistake in it
(00:55:44) JBSilvest: because of the other...
(00:55:54) Luke: so i tried to manually merge it. i'm not very good at that
(00:56:00) JBSilvest: (just consider it a future FYI )

committer: Tailor Script <tailor@pidgin.im>

diff -r 9bd849b376b4 -r 70aad91d9cb5 ChangeLog
--- a/ChangeLog	Thu Apr 08 04:36:48 2004 +0000
+++ b/ChangeLog	Thu Apr 08 04:43:53 2004 +0000
@@ -5,7 +5,7 @@
 	* The System Log returns (Ka-Hing Cheung)
 	* Added a conversation-drag-ended signal (Etan Reisner)
 	* Reorganized and cleaned up the MSN protocol plugin (Felipe Contreras)
-	* added the -c option to specify location of the .gaim directory, removed
+	* Added the -c option to specify location of the .gaim directory, removed
 	  the outdated -f option that no longer had any effect (Daniel Atallah)
 
 	Bug Fixes: