summaryrefslogtreecommitdiffstats
path: root/audio-drivers/jack
diff options
context:
space:
mode:
authorJuuso Alasuutari2007-03-19 00:44:38 +0000
committerJuuso Alasuutari2007-03-19 00:44:38 +0000
commitca1977bd34e0cf5d7f85bdab8e80f8f0ec54380c (patch)
treecd6fd401b2070fa181ebfa80007d5d9e35aecf60 /audio-drivers/jack
parent99c6896e959dc59ac54a17e5b22e49b5e3419db6 (diff)
jack: conflicts jackdmp
Diffstat (limited to 'audio-drivers/jack')
-rwxr-xr-xaudio-drivers/jack/CONFLICTS3
-rw-r--r--audio-drivers/jack/HISTORY3
2 files changed, 5 insertions, 1 deletions
diff --git a/audio-drivers/jack/CONFLICTS b/audio-drivers/jack/CONFLICTS
index e6f2e33ee3..f4ef0e980e 100755
--- a/audio-drivers/jack/CONFLICTS
+++ b/audio-drivers/jack/CONFLICTS
@@ -1 +1,2 @@
-conflicts jack-cvs
+conflicts jack-cvs &&
+conflicts jackdmp
diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index 3dd3e33d45..faf85d6ecc 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,3 +1,6 @@
+2007-03-19 Juuso Alasuutari <iuso@sourcemage.org>
+ * CONFLICTS: Added conflicts jackdmp.
+
2006-10-07 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: Updated to 0.102.20.
* CONFIGURE: Added queries for POSIX shm and buffer resize