diff options
author | Xavier Claessens <xclaesse@gmail.com> | 2009-08-26 15:54:29 +0800 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2009-08-26 15:57:55 +0800 |
commit | 1669cc99bae84e2506bb6b671843bd980f16b2bc (patch) | |
tree | e5bf576707f8de238a2b29a0fc7236ab49e8c7b8 /src/Makefile.am | |
parent | fbaa6100736ae6fd627b7f299bc9fab421a33e0f (diff) | |
parent | 13c650f07be34d376c9ef4e7966e470198cedf52 (diff) | |
download | gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.gz gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.bz2 gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.lz gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.xz gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.tar.zst gsoc2013-empathy-1669cc99bae84e2506bb6b671843bd980f16b2bc.zip |
Merge branch 'debug-window'
Conflicts:
src/empathy-debug-window.c
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6896c03f3..980f0029e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,7 +36,7 @@ empathy_handwritten_source = \ empathy-call-window.c empathy-call-window.h \ empathy-call-window-fullscreen.c empathy-call-window-fullscreen.h \ empathy-chatrooms-window.c empathy-chatrooms-window.h \ - empathy-debug-dialog.c empathy-debug-dialog.h \ + empathy-debug-window.c empathy-debug-window.h \ empathy-chat-window.c empathy-chat-window.h \ empathy-event-manager.c empathy-event-manager.h \ empathy-import-mc4-accounts.c empathy-import-mc4-accounts.h \ |