diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-08-25 05:41:04 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-08-25 05:41:04 -0300 |
| commit | f42aa4d98259b77fdd064334c9d570148f2e7547 (patch) | |
| tree | 6e94848a61e6f7a7ef3d2215b04e0ea5650b1dbf | |
| parent | 29fcd095d42c5e8b4fa4b7447dbeef6dd7b7ac9a (diff) | |
| parent | edc98fa1c50d60e9f1ab066765602e5972255b68 (diff) | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/blacklist
| -rw-r--r-- | blacklist.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/blacklist.txt b/blacklist.txt index d14a881..d4b5a3c 100644 --- a/blacklist.txt +++ b/blacklist.txt @@ -268,7 +268,9 @@ lirc-utils:lirc-parabola-utils::: adapted to nonfree linux kernel lirc:lirc-parabola::: adapted to nonfree linux kernel lsb-release:lsb-release::: rebranding luxblend25:blender-addon-luxrender::: adapted for the nonfree blender package that is built under svn -luxrender:luxrender-libre::: recommends nonfree opencl optional installation +luxmark:::: incompatible mesa-libcl-v10.2 +luxrays:luxrays-parabola::: incompatible mesa-libcl-v10.2 +luxrender:luxrender-parabola::: recommends nonfree opencl optional installation and incompatible mesa-libcl-v10.2 mac::fsf:Monkey.27s_Audio_Codec: Monkey's Audio Source Code License Agreement, changes must be contributed back mari0:::: is licensed under cc-by-nc-sa mate-icon-theme-faenza:mate-icon-theme-faenza-libre::: has nonfree distros and application icons |