Mercurial > pidgin.yaz
diff pidgin/gtkplugin.c @ 25802:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 4ead1ab25573 |
children | 865ed80b17e1 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 4ead1ab25573 |
children | 865ed80b17e1 |