# HG changeset patch # User Matti Hamalainen # Date 1193195071 -10800 # Node ID 74cfd332a56d8e13cc1664e4a9bc3c304c9b4d0e # Parent 047bf3ed21b2e2f9db5e5af8007ce29c985ffab0# Parent a0509b848ec4db3995116dc610e55182b12702c5 Automated merge with ssh://hg.atheme.org//hg/audacious diff -r 047bf3ed21b2 -r 74cfd332a56d Makefile --- a/Makefile Wed Oct 24 05:53:35 2007 +0300 +++ b/Makefile Wed Oct 24 06:04:31 2007 +0300 @@ -101,8 +101,7 @@ Skins/Refugee/text.png \ Skins/Refugee/titlebar.png \ Skins/Refugee/viscolor.txt \ - Skins/Refugee/volume.png \ - applications/audacious.desktop + Skins/Refugee/volume.png DISTCLEAN = extra.mk