diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-11-22 16:37:57 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-11-22 16:37:57 +0800 |
| commit | 22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6 (patch) | |
| tree | f3fbcd00c9042a738e1440f3ca6d0081c2cf281e /COPYING-DOCS | |
| parent | 356ab07267fb30aae5a71cd4c17d10044d86ecf4 (diff) | |
| parent | 8272468f01ba232565a518bdd7c8893eca751495 (diff) | |
| download | gsoc2013-empathy-22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6.tar gsoc2013-empathy-22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6.tar.gz gsoc2013-empathy-22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6.tar.bz2 gsoc2013-empathy-22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6.tar.lz gsoc2013-empathy-22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6.tar.xz gsoc2013-empathy-22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6.tar.zst gsoc2013-empathy-22c51f171e1644e0a9f64a0d3c4ee027aa9a1eb6.zip | |
Merge branch 'gnome-3-6'
Conflicts:
configure.ac
po/da.po
po/et.po
po/kn.po
po/mr.po
po/nb.po
po/sk.po
Diffstat (limited to 'COPYING-DOCS')
0 files changed, 0 insertions, 0 deletions