summaryrefslogtreecommitdiff
path: root/blacklist.txt
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-01-10 18:04:43 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-01-10 18:04:43 -0300
commit288c2f072c0d31e5a1ff36cca05a08e2df866a9f (patch)
tree164952e4c9dc7d2ba5cc3229c70842639a7620c1 /blacklist.txt
parentd3f872b6d1ba1641059efa189e927ffbbc9c6f9f (diff)
parent8f27645255df0bc3259c6283cf5f07428c7d3337 (diff)
Merge branch 'master' of ssh://gparabola/blacklist
Conflicts: blacklist.txt
Diffstat (limited to 'blacklist.txt')
-rw-r--r--blacklist.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/blacklist.txt b/blacklist.txt
index 4116011..e9c85b0 100644
--- a/blacklist.txt
+++ b/blacklist.txt
@@ -408,3 +408,5 @@ handbrake::includes a faac module (needs handbrake-libre) [[issue332]]
sauerbraten-data::CC-NC data [[issue336]]
sauerbraten::free but needs -data
truecrypt::non free [[issue352]]
+intel-ucode::no modification, use restrictions
+amd-ucode::no modification, use restrictions