Mercurial > pidgin.yaz
comparison pidgin/gtkprefs.c @ 20261:bebfd8bbe5eb
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 817e1c598dfe68428187d6c1cf968e88a8f8981f)
to branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 28 Sep 2007 17:13:38 +0000 |
parents | 6b8bc3309ab7 |
children | 02df6998b466 |
comparison
equal
deleted
inserted
replaced
20258:509ca8ebe515 | 20261:bebfd8bbe5eb |
---|