changeset 16635:a99d8161b7cd

merge of 'afdcaef358550ebdaf789c9b96a2bf1a28e92111' and 'c4b79fc29f848aaac864117551f2258dbf36b23b'
author Richard Laager <rlaager@wiktel.com>
date Sun, 29 Apr 2007 07:02:17 +0000
parents 85143795aad6 (current diff) 1939bd0f74e4 (diff)
children c39af5774c3e
files PROGRAMMING_NOTES libpurple/version.h pidgin/pixmaps/status/16/rtl/chat.png pidgin/pixmaps/status/22/rtl/chat.png pidgin/pixmaps/status/32/rtl/chat.png pidgin/pixmaps/status/48/rtl/chat.png pidgin/plugins/perl/common/GtkUI.pm pidgin/plugins/perl/common/GtkUI.xs
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Sun Apr 29 06:59:36 2007 +0000
+++ b/ChangeLog.API	Sun Apr 29 07:02:17 2007 +0000
@@ -164,14 +164,14 @@
 	* gaim_gtk_buddy_icon_get_scale_size() was changed to accept an
 	  additional parameter which is used to determine what kind of
 	  scaling should be done, if any.
-    * purple_request_input(), purple_request_choice(),
-      purple_request_choice_varg(), purple_request_action(),
-      purple_request_action_varg(), purple_request_fields(),
-      purple_request_yes_no(), purple_request_ok_cancel(),
-      purple_request_accept_cancel(), purple_request_file(), and
-      purple_request_folder() was changed to accept account, who, and
-      conversation parameters for associating the request with an account, a
-      buddy, or a conversation.
+	* purple_request_input(), purple_request_choice(),
+	  purple_request_choice_varg(), purple_request_action(),
+	  purple_request_action_varg(), purple_request_fields(),
+	  purple_request_yes_no(), purple_request_ok_cancel(),
+	  purple_request_accept_cancel(), purple_request_file(), and
+	  purple_request_folder() was changed to accept account, who, and
+	  conversation parameters for associating the request with an account, a
+	  buddy, or a conversation.
 
 	Removed:
 	* gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute