# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1191279592 -10800
# Node ID 6faf2562e5236e9b559bf843748cab17b76922c7
# Parent  17a6441c71b6c7d3754e1f60fe1a01ea836f74ff# Parent  cc66bd97836fa9390b0214b76e018830a7b765dd
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r cc66bd97836f -r 6faf2562e523 src/aac/libmp4.c
--- a/src/aac/libmp4.c	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/aac/libmp4.c	Tue Oct 02 01:59:52 2007 +0300
@@ -10,11 +10,11 @@
 #include <audacious/output.h>
 #include <audacious/util.h>
 #include <audacious/vfs.h>
-#include "audacious/i18n.h"
+#include <audacious/i18n.h>
 #include <audacious/strings.h>
 #include <audacious/main.h>
 #include <audacious/tuple.h>
-#include "audacious/tuple_formatter.h"
+#include <audacious/tuple_formatter.h>
 
 #define MP4_VERSION VERSION
 
diff -r cc66bd97836f -r 6faf2562e523 src/adplug/adplug-xmms.cc
--- a/src/adplug/adplug-xmms.cc	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/adplug/adplug-xmms.cc	Tue Oct 02 01:59:52 2007 +0300
@@ -29,7 +29,7 @@
 #include "emuopl.h"
 #include "silentopl.h"
 #include "players.h"
-#include "audacious/i18n.h"
+#include <audacious/i18n.h>
 extern "C"
 {
 #include <audacious/plugin.h>
diff -r cc66bd97836f -r 6faf2562e523 src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/console/Audacious_Driver.cxx	Tue Oct 02 01:59:52 2007 +0300
@@ -13,7 +13,7 @@
 #include <gtk/gtk.h>
 extern "C" {
 #include <audacious/tuple.h>
-#include "audacious/tuple_formatter.h"
+#include <audacious/tuple_formatter.h>
 #include <audacious/util.h>
 #include <audacious/output.h>
 #include <audacious/playlist.h>
diff -r cc66bd97836f -r 6faf2562e523 src/m3u/m3u.c
--- a/src/m3u/m3u.c	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/m3u/m3u.c	Tue Oct 02 01:59:52 2007 +0300
@@ -35,7 +35,7 @@
 #include <audacious/main.h>
 #include <audacious/util.h>
 #include <audacious/playlist.h>
-#include "audacious/playlist_container.h"
+#include <audacious/playlist_container.h>
 #include <audacious/plugin.h>
 #include <audacious/strings.h>
 
diff -r cc66bd97836f -r 6faf2562e523 src/pls/pls.c
--- a/src/pls/pls.c	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/pls/pls.c	Tue Oct 02 01:59:52 2007 +0300
@@ -34,7 +34,7 @@
 #include <audacious/main.h>
 #include <audacious/util.h>
 #include <audacious/playlist.h>
-#include "audacious/playlist_container.h"
+#include <audacious/playlist_container.h>
 #include <audacious/plugin.h>
 #include <audacious/vfs.h>
 #include <audacious/strings.h>
diff -r cc66bd97836f -r 6faf2562e523 src/sexypsf/plugin.c
--- a/src/sexypsf/plugin.c	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/sexypsf/plugin.c	Tue Oct 02 01:59:52 2007 +0300
@@ -20,7 +20,7 @@
 #include <audacious/plugin.h>
 #include <audacious/main.h>
 #include <audacious/tuple.h>
-#include "audacious/tuple_formatter.h"
+#include <audacious/tuple_formatter.h>
 #include <audacious/util.h>
 #include <audacious/vfs.h>
 #include <stdio.h>
diff -r cc66bd97836f -r 6faf2562e523 src/song_change/song_change.c
--- a/src/song_change/song_change.c	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/song_change/song_change.c	Tue Oct 02 01:59:52 2007 +0300
@@ -16,7 +16,7 @@
 #include <string.h>
 
 #include <audacious/plugin.h>
-#include "audacious/ui_preferences.h"
+#include <audacious/ui_preferences.h>
 #include <audacious/configdb.h>
 #include <audacious/auddrct.h>
 #include <audacious/formatter.h>
diff -r cc66bd97836f -r 6faf2562e523 src/wav/wav-sndfile.c
--- a/src/wav/wav-sndfile.c	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/wav/wav-sndfile.c	Tue Oct 02 01:59:52 2007 +0300
@@ -36,10 +36,10 @@
 
 #include <audacious/plugin.h>
 #include <audacious/util.h>
-#include "audacious/i18n.h"
+#include <audacious/i18n.h>
 #include <audacious/main.h>
 #include <audacious/tuple.h>
-#include "audacious/tuple_formatter.h"
+#include <audacious/tuple_formatter.h>
 #include <audacious/output.h>
 #include "wav-sndfile.h"
 
diff -r cc66bd97836f -r 6faf2562e523 src/wma/wma.c
--- a/src/wma/wma.c	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/wma/wma.c	Tue Oct 02 01:59:52 2007 +0300
@@ -40,10 +40,10 @@
 #include <audacious/util.h>
 #include <audacious/vfs.h>
 #include <audacious/strings.h>
-#include "audacious/i18n.h"
+#include <audacious/i18n.h>
 #include <audacious/main.h>
 #include <audacious/tuple.h>
-#include "audacious/tuple_formatter.h"
+#include <audacious/tuple_formatter.h>
 
 #include "avcodec.h"
 #include "avformat.h"
diff -r cc66bd97836f -r 6faf2562e523 src/xspf/xspf.c
--- a/src/xspf/xspf.c	Mon Oct 01 23:46:13 2007 +0100
+++ b/src/xspf/xspf.c	Tue Oct 02 01:59:52 2007 +0300
@@ -33,7 +33,7 @@
 #include <audacious/main.h>
 #include <audacious/util.h>
 #include <audacious/playlist.h>
-#include "audacious/playlist_container.h"
+#include <audacious/playlist_container.h>
 #include <audacious/plugin.h>
 
 #include <libxml/tree.h>