summaryrefslogtreecommitdiffstats
path: root/audio-drivers
diff options
context:
space:
mode:
authorIsmael Luceno2015-12-25 17:13:57 -0200
committerIsmael Luceno2015-12-25 17:15:51 -0200
commitdde2dca3a4ffca19736ae1175291db1cbc4d834a (patch)
tree3fb458b3ea913906743948a591ef1cf254d6b1dc /audio-drivers
parent68c3cbc0520c5d22b6bdad2e8b5ed05b7db2f08a (diff)
pulseaudio: Conflicts with apulse
Diffstat (limited to 'audio-drivers')
-rwxr-xr-xaudio-drivers/pulseaudio/CONFLICTS1
-rw-r--r--audio-drivers/pulseaudio/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/audio-drivers/pulseaudio/CONFLICTS b/audio-drivers/pulseaudio/CONFLICTS
new file mode 100755
index 0000000000..88108da713
--- /dev/null
+++ b/audio-drivers/pulseaudio/CONFLICTS
@@ -0,0 +1 @@
+conflicts apulse
diff --git a/audio-drivers/pulseaudio/HISTORY b/audio-drivers/pulseaudio/HISTORY
index e2ecd0913f..9660deba71 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,6 @@
+2015-12-25 Ismael Luceno <ismael@sourcemage.org>
+ * CONFLICTS: Conflicts with apulse
+
2015-04-06 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 6.0
* DEPENDS: add bluez5