summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2007-12-17 15:15:22 +0000
committerXavier Claessens <xclaesse@src.gnome.org>2007-12-17 15:15:22 +0000
commit50561b38dc05595c52a25529b1ff80ad876fabf6 (patch)
treefad8b02cbe25b0969cccbdc02f128e78c0765f01 /Makefile.am
parentbf49384fd8b27c64ed52ac82d61dc19c94fc120a (diff)
downloadtelepathy-account-widgets-50561b38dc05595c52a25529b1ff80ad876fabf6.tar.gz
Fix merge conflicts in po/ChangeLog
svn path=/trunk/; revision=484
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions