Merge commit 'cassidy/irc'
authorXavier Claessens <xclaesse@src.gnome.org>
Sun, 17 Feb 2008 23:38:19 +0000 (23:38 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Sun, 17 Feb 2008 23:38:19 +0000 (23:38 +0000)
commit8107cb72c02be53157fc87955b4bc4f454662182
treec37e04a560b3c654a5b509e2dd02c5a79178bed1
parent20c9a85036f7c951eb24df9587db695895869342
Merge commit 'cassidy/irc'

svn path=/trunk/; revision=649
36 files changed:
TODO
configure.ac
docs/libempathy-gtk/libempathy-gtk-docs.sgml
docs/libempathy/libempathy-docs.sgml
docs/libempathy/libempathy.types
libempathy-gtk/Makefile.am
libempathy-gtk/empathy-account-widget-irc.c [new file with mode: 0644]
libempathy-gtk/empathy-account-widget-irc.glade [new file with mode: 0644]
libempathy-gtk/empathy-account-widget-irc.h [new file with mode: 0644]
libempathy-gtk/empathy-accounts-dialog.c
libempathy-gtk/empathy-irc-network-dialog.c [new file with mode: 0644]
libempathy-gtk/empathy-irc-network-dialog.h [new file with mode: 0644]
libempathy-gtk/totem-subtitle-encoding.c [new file with mode: 0644]
libempathy-gtk/totem-subtitle-encoding.h [new file with mode: 0644]
libempathy/Makefile.am
libempathy/empathy-irc-network-manager.c [new file with mode: 0644]
libempathy/empathy-irc-network-manager.h [new file with mode: 0644]
libempathy/empathy-irc-network.c [new file with mode: 0644]
libempathy/empathy-irc-network.h [new file with mode: 0644]
libempathy/empathy-irc-networks.dtd [new file with mode: 0644]
libempathy/empathy-irc-server.c [new file with mode: 0644]
libempathy/empathy-irc-server.h [new file with mode: 0644]
libempathy/irc-networks.xml [new file with mode: 0644]
m4/Makefile.am [new file with mode: 0644]
po/POTFILES.in
tests/Makefile.am
tests/check-empathy-irc-network-manager.c [new file with mode: 0644]
tests/check-empathy-irc-network.c [new file with mode: 0644]
tests/check-empathy-irc-server.c [new file with mode: 0644]
tests/check-irc-helper.c [new file with mode: 0644]
tests/check-irc-helper.h [new file with mode: 0644]
tests/check-libempathy.h
tests/check-main.c
tests/xml/.gitignore [new file with mode: 0644]
tests/xml/default-irc-networks-sample.xml [new file with mode: 0644]
tests/xml/user-irc-networks-sample.xml [new file with mode: 0644]