Mercurial > pidgin.yaz
changeset 19661:aa3920f45ff3
merge of '906281124efc7c5fcab1d5a7b8066c6a99d7927d'
and '9d3e08ca8d3c17d78b9671fdffc4a0769a0a1495'
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Thu, 06 Sep 2007 06:59:23 +0000 |
| parents | 2f7b3564bb7e (diff) 3617681a2694 (current diff) |
| children | 9600414aca2e |
| files | COPYRIGHT finch/libgnt/gntmenu.c libpurple/certificate.h libpurple/proxy.c libpurple/util.c pidgin/gtkmain.c |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Thu Sep 06 06:30:34 2007 +0000 +++ b/COPYRIGHT Thu Sep 06 06:59:23 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:30:34 2007 +0000 +++ b/pidgin/gtkimhtml.c Thu Sep 06 06:59:23 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); }