aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-29 22:56:11 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-29 22:56:11 +0800
commitb5764db7cf39aeaaabc261ece49c57776540a0be (patch)
tree7cadc15c0f9c1c9b7ff7d21de7020201add612aa /po
parent67869e50ff885ea10280447edbe6ee22520e26cb (diff)
parent82b0f4038f7c257253962080270e5625dd5de152 (diff)
downloadgsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar
gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.gz
gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.bz2
gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.lz
gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.xz
gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.zst
gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.zip
Merge remote-tracking branch 'jonny/ft'
Conflicts: libempathy/empathy-tp-file.c
Diffstat (limited to 'po')
-rw-r--r--po/POTFILES.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 46cb3a0d5..2d0012f65 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ data/empathy-accounts.desktop.in.in
libempathy/empathy-ft-handler.c
libempathy/empathy-message.c
libempathy/empathy-tp-contact-list.c
-libempathy/empathy-tp-file.c
libempathy/empathy-utils.c
libempathy/empathy-time.c