summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-10-14 04:18:24 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2013-10-14 04:18:24 -0200
commitdeef5bd96e2c1269ada69e183cf66d193747182a (patch)
treeb07ae744b728049e127eae1cd8085d9dd9dd8ac6
parentee177faae2800fd3a821467b921425efcb49e180 (diff)
parent201983aa42c6a25b332838d6f3fd45bd57ae819c (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/blacklist
-rw-r--r--blacklist.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/blacklist.txt b/blacklist.txt
index ff23a36..5374f08 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -323,6 +323,7 @@ moonlight::recommends nonfree software (Microsoft Media Pack)
mp32ogg::Artistic License 1.0
mplayer-vaapi:mplayer-vaapi-libre:depends on faac
mplayer:mplayer-libre: depends on nonfree package faac, Parabola use mplayer-libre, whithout dependency of faac
+murmure-ice: need the dependance zero-ice that containe a part with an ICE licence (proprietary)
ndiswrapper
ndiswrapper-lts
ndiswrapper-utils
@@ -548,3 +549,4 @@ xsp:xsp: rebranding
xv
xvba-video-open::only useful with nonfree GPU drivers
zd1211-firmware::It's Free, but drivers are propietary and it's not included in linux-libre.
+zeroc-ice: contain a part which is proprietary ICE