merge git work
authorXavier Claessens <xclaesse@src.gnome.org>
Sat, 29 Dec 2007 15:49:47 +0000 (15:49 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Sat, 29 Dec 2007 15:49:47 +0000 (15:49 +0000)
commitb8607414ea0e41c44a09d31ebcd0437a3c867a24
tree0004eceb52b4bb3a4da1275057e46ea80e840a05
parent736ff5bf9f668528f1a1db1c8c135a8165a1b044
merge git work

svn path=/trunk/; revision=518
41 files changed:
.gitignore
Makefile.am
TODO
acinclude.m4 [new file with mode: 0644]
configure.ac
libempathy-gtk/Makefile.am
libempathy-gtk/empathy-call-window.c
libempathy-gtk/empathy-call-window.h
libempathy-gtk/empathy-chat-view.c
libempathy-gtk/empathy-contact-list-view.c
libempathy-gtk/empathy-group-chat.glade
libempathy-gtk/empathy-theme-boxes.c
libempathy-gtk/empathy-theme-boxes.h
libempathy-gtk/empathy-theme-irc.c
libempathy-gtk/empathy-theme-manager.c
libempathy-gtk/empathy-theme-utils.c [new file with mode: 0644]
libempathy-gtk/empathy-theme-utils.h [new file with mode: 0644]
libempathy-gtk/empathy-theme.c
libempathy-gtk/empathy-theme.h
libempathy-gtk/empathy-ui-utils.c
libempathy-gtk/empathy-ui-utils.h
m4/.gitignore [deleted file]
m4/acinclude.m4 [deleted file]
m4/empathy-args.m4 [deleted file]
m4/empathy-valgrind.m4 [deleted file]
po/.gitignore
po/POTFILES.in
rules/check.mak [deleted file]
src/.gitignore
src/empathy-call-chandler.c
src/empathy-chat-chandler.c
svn2cl.xsl [new file with mode: 0644]
tests/.gitignore [deleted file]
tests/Makefile.am
tests/check-empathy-utils.c [deleted file]
tests/check-helpers.c [deleted file]
tests/check-helpers.h [deleted file]
tests/check-libempathy.h [deleted file]
tests/check-main.c [deleted file]
tests/dlopen.supp [deleted file]
tests/valgrind.supp [deleted file]