Mercurial > pidgin
diff finch/gntprefs.c @ 25209:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | c38d72677c8a |
children | f7c5bb2f6623 cc1e35fa774d |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | c38d72677c8a |
children | f7c5bb2f6623 cc1e35fa774d |