diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-17 23:15:22 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-17 23:15:22 +0800 |
| commit | 50561b38dc05595c52a25529b1ff80ad876fabf6 (patch) | |
| tree | fad8b02cbe25b0969cccbdc02f128e78c0765f01 /Makefile.am | |
| parent | bf49384fd8b27c64ed52ac82d61dc19c94fc120a (diff) | |
| download | gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.tar gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.tar.gz gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.tar.bz2 gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.tar.lz gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.tar.xz gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.tar.zst gsoc2013-empathy-50561b38dc05595c52a25529b1ff80ad876fabf6.zip | |
Fix merge conflicts in po/ChangeLog
svn path=/trunk/; revision=484
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions