# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1196516560 21600
# Node ID b5a61f28daba3e18c425604e0b26a5447da19bd5
# Parent  92e3662004d63f179cc651977b2567b97239a915# Parent  5f9227fe09e916a522bf0b397802c33910d20e02
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 92e3662004d6 -r b5a61f28daba src/audacious/Makefile
--- a/src/audacious/Makefile	Sat Dec 01 07:41:56 2007 -0600
+++ b/src/audacious/Makefile	Sat Dec 01 07:42:40 2007 -0600
@@ -118,35 +118,34 @@
 	   vfs_buffered_file.h	\
 	   xconvert.h
 
-DATA = images/about-logo.png			\
-       images/appearance.png			\
-       images/audacious_eq.xpm			\
-       images/audacious_player.xpm		\
+DATA = images/about-logo.png				\
+       images/appearance.png				\
+       images/audacious_eq.xpm				\
+       images/audacious_player.xpm			\
        images/audacious_playlist.xpm		\
-       images/audio.png				\
-       images/connectivity.png			\
-       images/eq.png				\
-       images/info.png				\
+       images/audio.png						\
+       images/connectivity.png				\
+       images/info.png						\
        images/menu_invert_playlist.png		\
-       images/menu_queue_toggle.png		\
+       images/menu_queue_toggle.png			\
        images/menu_randomize_playlist.png	\
-       images/menu_remove_dups.png		\
+       images/menu_remove_dups.png			\
        images/menu_remove_unavail.png		\
-       images/menu_select_all.png		\
+       images/menu_select_all.png			\
        images/menu_select_invert.png		\
-       images/menu_select_none.png		\
-       images/menu_sort_artist.png		\
+       images/menu_select_none.png			\
+       images/menu_sort_artist.png			\
        images/menu_sort_filename.png		\
        images/menu_sort_pathfile.png		\
-       images/menu_sort_title.png		\
-       images/mouse.png				\
-       images/pl.png				\
-       images/play.png				\
-       images/playlist.png			\
-       images/plugins.png			\
-       ui/equalizer.ui				\
-       ui/mainwin.ui				\
-       ui/playlist.ui				\
+       images/menu_sort_title.png			\
+       images/mouse.png						\
+       images/pl.png						\
+       images/play.png						\
+       images/playlist.png					\
+       images/plugins.png					\
+       ui/equalizer.ui						\
+       ui/mainwin.ui						\
+       ui/playlist.ui						\
        ui/carbon-menubar.ui
 
 CLEAN = build_stamp.c libaudacious.exe.a