Mercurial > pidgin.yaz
diff pidgin/gtklog.c @ 25802:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 42724bd41274 |
children | 2e179c60f8c9 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 42724bd41274 |
children | 2e179c60f8c9 |