Mercurial > pidgin.yaz
changeset 19664:9600414aca2e
merge of '820a17ae981af30a64647d8438bd769db8bb4689'
and 'afad2dc8f17981c8e1b0ba3760c573843bddff49'
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Thu, 06 Sep 2007 07:01:39 +0000 |
| parents | aa3920f45ff3 (diff) ccf627e2e0cc (current diff) |
| children | 01ad48d825bd |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Thu Sep 06 06:51:29 2007 +0000 +++ b/COPYRIGHT Thu Sep 06 07:01:39 2007 +0000 @@ -338,7 +338,6 @@ Michael Shkutkov Ettore Simone John Silvestri -Ankit Singla Craig Slusher Alex Smith Brad Smith
--- a/pidgin/gtkimhtml.c Thu Sep 06 06:51:29 2007 +0000 +++ b/pidgin/gtkimhtml.c Thu Sep 06 07:01:39 2007 +0000 @@ -4890,7 +4890,7 @@ } else if (c == '"') { str = g_string_append(str, """); } else if (c == '\n') { - str = g_string_append(str, "<br>\n"); + str = g_string_append(str, "<br>"); } else { str = g_string_append_unichar(str, c); }