diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
| commit | 58d6937e71aea203f6693a68146018f950922fbc (patch) | |
| tree | 3b53b76f930f60717debca5e0d612eeab0279b39 /extra/pidgin | |
| parent | d07d53d7af1e9694d9558783841bc2df3124a90f (diff) | |
| parent | f651180e6b1ac9508ec0d1d9b94972de776020a9 (diff) | |
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/addresses/PKGBUILD
community/chmsee/PKGBUILD
community/coin/PKGBUILD
community/critterding/PKGBUILD
community/distcc/PKGBUILD
community/djview4/PKGBUILD
community/freedroid/PKGBUILD
community/gnumail/PKGBUILD
community/gyachi/PKGBUILD
community/java-oracle/PKGBUILD
community/liboop/PKGBUILD
community/ltris/PKGBUILD
community/nepim/PKGBUILD
community/pantomime/PKGBUILD
community/pyxattr/PKGBUILD
community/soqt/PKGBUILD
community/tilda/PKGBUILD
community/unrealircd/PKGBUILD
community/uqm/PKGBUILD
core/dnsutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
core/vpnc/PKGBUILD
extra/apache/PKGBUILD
extra/bind/PKGBUILD
extra/bzflag/PKGBUILD
extra/ccache/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/cups/PKGBUILD
extra/doxygen/PKGBUILD
extra/fam/PKGBUILD
extra/fcitx/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoip/PKGBUILD
extra/gtk2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/libffi/PKGBUILD
extra/libfwbuilder/PKGBUILD
extra/libmpd/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt/PKGBUILD
extra/samba/PKGBUILD
extra/wireshark/PKGBUILD
extra/xulrunner/PKGBUILD
multilib-testing/lib32-keyutils/PKGBUILD
multilib-testing/lib32-udev/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dash/PKGBUILD
testing/libssh2/PKGBUILD
Diffstat (limited to 'extra/pidgin')
| -rw-r--r-- | extra/pidgin/ticket-14351-multiple-display-of-room-members.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch deleted file mode 100644 index bf0966891..000000000 --- a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch +++ /dev/null @@ -1,17 +0,0 @@ -# -# -# patch "libpurple/conversation.c" -# from [cd6817f4863abafef969359f65cc025f9483b401] -# to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803] -# -============================================================ ---- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401 -+++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803 -@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC - } - - g_hash_table_remove_all(chat->users); -- chat->users = NULL; - - g_list_free(users); - chat->in_room = NULL; |