aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-mic-menu.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-16 20:00:41 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-04-16 20:00:41 +0800
commit6094f6b6b5c56f50ffa65849537b310615498c1b (patch)
tree6161fdd0320093bdbfbcb460e6eda701cf85345f /src/empathy-mic-menu.c
parenta26a5165bde37fad6db712cc96304c4b74ba732d (diff)
parenta04eca8be3870bf8934a8360977d2cc6d275d2d6 (diff)
downloadgsoc2013-empathy-6094f6b6b5c56f50ffa65849537b310615498c1b.tar
gsoc2013-empathy-6094f6b6b5c56f50ffa65849537b310615498c1b.tar.gz
gsoc2013-empathy-6094f6b6b5c56f50ffa65849537b310615498c1b.tar.bz2
gsoc2013-empathy-6094f6b6b5c56f50ffa65849537b310615498c1b.tar.lz
gsoc2013-empathy-6094f6b6b5c56f50ffa65849537b310615498c1b.tar.xz
gsoc2013-empathy-6094f6b6b5c56f50ffa65849537b310615498c1b.tar.zst
gsoc2013-empathy-6094f6b6b5c56f50ffa65849537b310615498c1b.zip
Merge branch 'gnome-3-4'
Conflicts: configure.ac po/sk.po po/zh_CN.po
Diffstat (limited to 'src/empathy-mic-menu.c')
0 files changed, 0 insertions, 0 deletions