summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-packageslists
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-10-21 18:41:40 +0200
committeranonym <anonym@riseup.net>2015-10-21 18:41:40 +0200
commit7874d8dfdd25db50123bdb358cd5da40ae72550c (patch)
tree0a321e44bcb85a63db59e69ce166751f2f3a36f4 /config/chroot_local-packageslists
parente77b70ffaef2c1397210bad816bb0bed07e1540d (diff)
parent4c64182b0bc75f876d83036a6d60731731f90bcd (diff)
Merge branch 'devel' into feature/jessie
Conflicts: config/chroot_apt/preferences wiki/src/contribute/release_process/test.mdwn
Diffstat (limited to 'config/chroot_local-packageslists')
-rw-r--r--config/chroot_local-packageslists/tails-common.list3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 2101426..a055a45 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -242,6 +242,7 @@ xserver-xorg-input-vmmouse
#endif
### Firmwares
+firmware-amd-graphics
firmware-atheros
firmware-brcm80211
firmware-ipw2x00
@@ -250,7 +251,7 @@ firmware-libertas
firmware-linux
firmware-linux-free
firmware-linux-nonfree
-firmware-ralink
+firmware-misc-nonfree
firmware-realtek
firmware-zd1211
b43-fwcutter