changeset 18164:1100b05e9fb7

merge of '32961dad56e96e8d450230e7266cffe8b7deb058' and '7997723d5d06867d57a08dedf7d62b52c4be20e0'
author Nathan Walp <nwalp@pidgin.im>
date Sun, 17 Jun 2007 15:29:02 +0000
parents c4518bbca240 (diff) 703872bf33c6 (current diff)
children 580eeb340cf4
files
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/prefs.c	Sun Jun 17 15:27:35 2007 +0000
+++ b/libpurple/prefs.c	Sun Jun 17 15:29:02 2007 +0000
@@ -1355,7 +1355,6 @@
 	purple_prefs_remove("/plugins/core/autorecon/hide_reconnecting_dialog");
 	purple_prefs_remove("/plugins/core/autorecon/restore_state");
 	purple_prefs_remove("/plugins/core/autorecon");
-	purple_prefs_remove("/purple/debug/timestamps");
 
 	/* Convert old sounds while_away pref to new 3-way pref. */
 	if (purple_prefs_exists("/purple/sound/while_away") &&