soc.2008.masterpassword: bbcf2492: explicit merge of '8907c1914bd7865292afb...
khc at pidgin.im
khc at pidgin.im
Mon Jan 5 03:55:53 EST 2009
-----------------------------------------------------------------
Revision: bbcf24927e5adefb9dddc97b1d86e55ebc3710c4
Ancestor: 0c4505a67ab2e90bf634a3d235022d369302e129
Ancestor: 8907c1914bd7865292afb166946d610f1aa04795
Author: khc at pidgin.im
Date: 2009-01-03T21:38:25
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/bbcf24927e5adefb9dddc97b1d86e55ebc3710c4
Deleted entries:
pidgin/pixmaps/buddy_icons pidgin/pixmaps/buddy_icons/qq
pidgin/pixmaps/buddy_icons/qq/Makefile.am
pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
pidgin/pixmaps/buddy_icons/qq/qq_1.png
pidgin/pixmaps/buddy_icons/qq/qq_10.png
pidgin/pixmaps/buddy_icons/qq/qq_100.png
pidgin/pixmaps/buddy_icons/qq/qq_11.png
pidgin/pixmaps/buddy_icons/qq/qq_12.png
pidgin/pixmaps/buddy_icons/qq/qq_13.png
pidgin/pixmaps/buddy_icons/qq/qq_14.png
pidgin/pixmaps/buddy_icons/qq/qq_15.png
pidgin/pixmaps/buddy_icons/qq/qq_16.png
pidgin/pixmaps/buddy_icons/qq/qq_17.png
pidgin/pixmaps/buddy_icons/qq/qq_18.png
pidgin/pixmaps/buddy_icons/qq/qq_19.png
pidgin/pixmaps/buddy_icons/qq/qq_2.png
pidgin/pixmaps/buddy_icons/qq/qq_20.png
pidgin/pixmaps/buddy_icons/qq/qq_21.png
pidgin/pixmaps/buddy_icons/qq/qq_22.png
pidgin/pixmaps/buddy_icons/qq/qq_23.png
pidgin/pixmaps/buddy_icons/qq/qq_24.png
pidgin/pixmaps/buddy_icons/qq/qq_25.png
pidgin/pixmaps/buddy_icons/qq/qq_26.png
pidgin/pixmaps/buddy_icons/qq/qq_27.png
pidgin/pixmaps/buddy_icons/qq/qq_28.png
pidgin/pixmaps/buddy_icons/qq/qq_29.png
pidgin/pixmaps/buddy_icons/qq/qq_3.png
pidgin/pixmaps/buddy_icons/qq/qq_30.png
pidgin/pixmaps/buddy_icons/qq/qq_31.png
pidgin/pixmaps/buddy_icons/qq/qq_32.png
pidgin/pixmaps/buddy_icons/qq/qq_33.png
pidgin/pixmaps/buddy_icons/qq/qq_34.png
pidgin/pixmaps/buddy_icons/qq/qq_35.png
pidgin/pixmaps/buddy_icons/qq/qq_36.png
pidgin/pixmaps/buddy_icons/qq/qq_37.png
pidgin/pixmaps/buddy_icons/qq/qq_38.png
pidgin/pixmaps/buddy_icons/qq/qq_39.png
pidgin/pixmaps/buddy_icons/qq/qq_4.png
pidgin/pixmaps/buddy_icons/qq/qq_40.png
pidgin/pixmaps/buddy_icons/qq/qq_41.png
pidgin/pixmaps/buddy_icons/qq/qq_42.png
pidgin/pixmaps/buddy_icons/qq/qq_43.png
pidgin/pixmaps/buddy_icons/qq/qq_44.png
pidgin/pixmaps/buddy_icons/qq/qq_45.png
pidgin/pixmaps/buddy_icons/qq/qq_46.png
pidgin/pixmaps/buddy_icons/qq/qq_47.png
pidgin/pixmaps/buddy_icons/qq/qq_48.png
pidgin/pixmaps/buddy_icons/qq/qq_49.png
pidgin/pixmaps/buddy_icons/qq/qq_5.png
pidgin/pixmaps/buddy_icons/qq/qq_50.png
pidgin/pixmaps/buddy_icons/qq/qq_51.png
pidgin/pixmaps/buddy_icons/qq/qq_52.png
pidgin/pixmaps/buddy_icons/qq/qq_53.png
pidgin/pixmaps/buddy_icons/qq/qq_54.png
pidgin/pixmaps/buddy_icons/qq/qq_55.png
pidgin/pixmaps/buddy_icons/qq/qq_56.png
pidgin/pixmaps/buddy_icons/qq/qq_57.png
pidgin/pixmaps/buddy_icons/qq/qq_58.png
pidgin/pixmaps/buddy_icons/qq/qq_59.png
pidgin/pixmaps/buddy_icons/qq/qq_6.png
pidgin/pixmaps/buddy_icons/qq/qq_60.png
pidgin/pixmaps/buddy_icons/qq/qq_61.png
pidgin/pixmaps/buddy_icons/qq/qq_62.png
pidgin/pixmaps/buddy_icons/qq/qq_63.png
pidgin/pixmaps/buddy_icons/qq/qq_64.png
pidgin/pixmaps/buddy_icons/qq/qq_65.png
pidgin/pixmaps/buddy_icons/qq/qq_66.png
pidgin/pixmaps/buddy_icons/qq/qq_67.png
pidgin/pixmaps/buddy_icons/qq/qq_68.png
pidgin/pixmaps/buddy_icons/qq/qq_69.png
pidgin/pixmaps/buddy_icons/qq/qq_7.png
pidgin/pixmaps/buddy_icons/qq/qq_70.png
pidgin/pixmaps/buddy_icons/qq/qq_71.png
pidgin/pixmaps/buddy_icons/qq/qq_72.png
pidgin/pixmaps/buddy_icons/qq/qq_73.png
pidgin/pixmaps/buddy_icons/qq/qq_74.png
pidgin/pixmaps/buddy_icons/qq/qq_75.png
pidgin/pixmaps/buddy_icons/qq/qq_76.png
pidgin/pixmaps/buddy_icons/qq/qq_77.png
pidgin/pixmaps/buddy_icons/qq/qq_78.png
pidgin/pixmaps/buddy_icons/qq/qq_79.png
pidgin/pixmaps/buddy_icons/qq/qq_8.png
pidgin/pixmaps/buddy_icons/qq/qq_80.png
pidgin/pixmaps/buddy_icons/qq/qq_81.png
pidgin/pixmaps/buddy_icons/qq/qq_82.png
pidgin/pixmaps/buddy_icons/qq/qq_83.png
pidgin/pixmaps/buddy_icons/qq/qq_84.png
pidgin/pixmaps/buddy_icons/qq/qq_85.png
pidgin/pixmaps/buddy_icons/qq/qq_86.png
pidgin/pixmaps/buddy_icons/qq/qq_87.png
pidgin/pixmaps/buddy_icons/qq/qq_88.png
pidgin/pixmaps/buddy_icons/qq/qq_89.png
pidgin/pixmaps/buddy_icons/qq/qq_9.png
pidgin/pixmaps/buddy_icons/qq/qq_90.png
pidgin/pixmaps/buddy_icons/qq/qq_91.png
pidgin/pixmaps/buddy_icons/qq/qq_92.png
pidgin/pixmaps/buddy_icons/qq/qq_93.png
pidgin/pixmaps/buddy_icons/qq/qq_94.png
pidgin/pixmaps/buddy_icons/qq/qq_95.png
pidgin/pixmaps/buddy_icons/qq/qq_96.png
pidgin/pixmaps/buddy_icons/qq/qq_97.png
pidgin/pixmaps/buddy_icons/qq/qq_98.png
pidgin/pixmaps/buddy_icons/qq/qq_99.png
Added files:
libpurple/keyring.c libpurple/keyring.h
libpurple/plugins/keyrings/Makefile.am
libpurple/plugins/keyrings/gnomekeyring.c
libpurple/plugins/keyrings/internalkeyring.c
libpurple/plugins/keyrings/kwallet.cpp po/ga.po
Added directories:
libpurple/plugins/keyrings
Modified files:
COPYRIGHT ChangeLog configure.ac finch/gntaccount.c
finch/gntblist.c finch/gntprefs.c libpurple/Makefile.am
libpurple/account.c libpurple/account.h
libpurple/connection.c libpurple/connection.h
libpurple/core.c libpurple/example/nullclient.c
libpurple/plugin.c libpurple/plugin.h
libpurple/plugins/Makefile.am
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/roster.c
libpurple/protocols/qq/buddy_info.c
libpurple/protocols/qq/qq.h libpurple/protocols/qq/utils.c
libpurple/protocols/qq/utils.h libpurple/prpl.c
libpurple/xmlnode.h pidgin/gtkaccount.c pidgin/gtkblist.c
pidgin/gtkdialogs.c pidgin/gtknotify.c pidgin/gtkprefs.c
pidgin/pixmaps/Makefile.am pidgin/plugins/Makefile.mingw
pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/cs.po
po/es.po po/fi.po po/gl.po po/he.po po/it.po po/nl.po
po/nn.po po/pt_BR.po po/zh_HK.po po/zh_TW.po
ChangeLog:
explicit merge of '8907c1914bd7865292afb166946d610f1aa04795'
and '0c4505a67ab2e90bf634a3d235022d369302e129'
More information about the Commits
mailing list