diff options
| author | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-20 21:00:51 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2009-10-20 21:00:51 +0800 |
| commit | 105cc83e67ef41c35998aaaaae8bf18c56be65c0 (patch) | |
| tree | 03a20a791ba481ddb65f34e1a4a1777b7d534d25 /m4 | |
| parent | 6496713f0997ab90e7ee686819640b22b4911aea (diff) | |
| parent | da500948288ec5e9e675502151e5305bdf063592 (diff) | |
| download | gsoc2013-empathy-105cc83e67ef41c35998aaaaae8bf18c56be65c0.tar gsoc2013-empathy-105cc83e67ef41c35998aaaaae8bf18c56be65c0.tar.gz gsoc2013-empathy-105cc83e67ef41c35998aaaaae8bf18c56be65c0.tar.bz2 gsoc2013-empathy-105cc83e67ef41c35998aaaaae8bf18c56be65c0.tar.lz gsoc2013-empathy-105cc83e67ef41c35998aaaaae8bf18c56be65c0.tar.xz gsoc2013-empathy-105cc83e67ef41c35998aaaaae8bf18c56be65c0.tar.zst gsoc2013-empathy-105cc83e67ef41c35998aaaaae8bf18c56be65c0.zip | |
Merge branch 'slatez-applets'
Conflicts:
Makefile.am
configure.ac
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'm4')
0 files changed, 0 insertions, 0 deletions