diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 21:24:26 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 21:24:26 +0800 |
| commit | 05649508bf21c519402a049ba5be367430eb58d5 (patch) | |
| tree | d36b827cc1b2f1643e7dced5321f4900cd3f67d0 /configure.ac | |
| parent | 26b9e04f1c40888bba66bcaace30d9f0feac45fc (diff) | |
| parent | bf32eb7eb97820578b4f878e57ca9105fc7f5147 (diff) | |
| download | gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.gz gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.bz2 gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.lz gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.xz gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.tar.zst gsoc2013-empathy-05649508bf21c519402a049ba5be367430eb58d5.zip | |
Merge branch 'gnome-3-4'
Conflicts:
NEWS
configure.ac
src/empathy-audio-src.c
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions