diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-31 20:21:23 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-31 20:21:23 +0800 |
commit | 81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a (patch) | |
tree | 858621ddfab85401af1b61bf23865b27c9d1d8a6 /src/empathy-video-src.c | |
parent | 459911df1c715b033211f5358425ce3ed7be3512 (diff) | |
parent | fabe2b1b33eda5bac20e745cd0af5f96bba1b553 (diff) | |
download | gsoc2013-empathy-81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a.tar gsoc2013-empathy-81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a.tar.gz gsoc2013-empathy-81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a.tar.bz2 gsoc2013-empathy-81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a.tar.lz gsoc2013-empathy-81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a.tar.xz gsoc2013-empathy-81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a.tar.zst gsoc2013-empathy-81c169d8dcc6b3b3c2c9a2253da23c5e657ddf3a.zip |
Merge remote-tracking branch 'origin/gnome-3-10'
Conflicts:
po/cs.po
po/es.po
po/nb.po
Diffstat (limited to 'src/empathy-video-src.c')
0 files changed, 0 insertions, 0 deletions