diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-28 17:20:27 +0800 |
| commit | 1d153c1cf91edce537bc64efb01b5a496b35518e (patch) | |
| tree | de8ba4359a0341bd0c8c6e1a7495f4f39fb565f1 /libempathy-gtk/Makefile.am | |
| parent | b50b7039d3b52f33df94e5a3526d9f43a51401ad (diff) | |
| parent | 6df1c4bdd81fbbb288b8e49c3bea9a1dd2e005a6 (diff) | |
| download | gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.gz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.bz2 gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.lz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.xz gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.tar.zst gsoc2013-empathy-1d153c1cf91edce537bc64efb01b5a496b35518e.zip | |
Merge commit 'upstream/master' into mc5
Conflicts:
libempathy-gtk/empathy-account-widget.c
src/empathy.c
Diffstat (limited to 'libempathy-gtk/Makefile.am')
| -rw-r--r-- | libempathy-gtk/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 94cc4ee15..7f93accd3 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -41,6 +41,7 @@ libempathy_gtk_handwritten_source = \ empathy-contact-list-store.c \ empathy-contact-list-view.c \ empathy-contact-menu.c \ + empathy-share-my-desktop.c \ empathy-contact-selector.c \ empathy-contact-widget.c \ empathy-geometry.c \ @@ -60,6 +61,7 @@ libempathy_gtk_handwritten_source = \ empathy-theme-boxes.c \ empathy-theme-irc.c \ empathy-theme-manager.c \ + empathy-kludge-label.c \ empathy-ui-utils.c libempathy_gtk_la_SOURCES = \ @@ -100,6 +102,7 @@ libempathy_gtk_headers = \ empathy-contact-list-store.h \ empathy-contact-list-view.h \ empathy-contact-menu.h \ + empathy-share-my-desktop.h \ empathy-contact-selector.h \ empathy-contact-widget.h \ empathy-geometry.h \ @@ -120,6 +123,7 @@ libempathy_gtk_headers = \ empathy-theme-boxes.h \ empathy-theme-irc.h \ empathy-theme-manager.h \ + empathy-kludge-label.h \ empathy-ui-utils.h check_c_sources = \ |