Mercurial > pidgin.yaz
diff pidgin/gtkblist.h @ 25802:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 86b0dc1f60ae |
children | 1242a922a4bc aaaff38e144f 96af49d5758d |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 86b0dc1f60ae |
children | 1242a922a4bc aaaff38e144f 96af49d5758d |