diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-02-04 16:08:07 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-02-04 16:08:07 -0200 |
| commit | e58d4fff320e260d2df50874c32460a73212f13a (patch) | |
| tree | c964ba8a9ad7457f61c3d73212cda47846eff45b /blacklist.txt | |
| parent | 494f17926ebad1d53f1d44fb45b8bb878c815ee5 (diff) | |
| parent | 0b410febfb1c0e289de09795c83719313b026934 (diff) | |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/blacklist
Diffstat (limited to 'blacklist.txt')
| -rw-r--r-- | blacklist.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/blacklist.txt b/blacklist.txt index 80d5027..7e173a8 100644 --- a/blacklist.txt +++ b/blacklist.txt @@ -324,7 +324,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) +murmure-ice:: need the dependance zero-ice that containe a part with an ICE licence (proprietary) ndiswrapper:: ndiswrapper-lts:: ndiswrapper-utils:: @@ -546,7 +546,7 @@ xarchiver:xarchiver-libre: recommends unrar xbmc:xbmc-libre: recommends unrar xchat:xchat-libre: refers to a nonfree browser in its URL handlers xdm-archlinux:: [[issue46]] -xorg-fonts-100dpi:xorg-fonts-100dpi: nonfree fonts +xorg-fonts-100dpi:xorg-fonts-100dpi-libre: nonfree fonts xorg-fonts-75dpi:xorg-fonts-75dpi-libre: nonfree fonts xorg-fonts-type1:xorg-fonts-type1-libre: nonfree fonts xpdf-chinese-simplified:: @@ -559,4 +559,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: contains a part which is proprietary ICE +zeroc-ice:: contains a part which is proprietary ICE |