summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-packageslists
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-10-26 21:34:22 +0100
committeranonym <anonym@riseup.net>2015-10-26 21:34:22 +0100
commit4c85c1d89befeb57107f3f834d0101d051efac03 (patch)
treee3b1b32c30a731109215e0fb95271f43b3b2077a /config/chroot_local-packageslists
parentd0923e35e2e26357bfcb912caac4d226fefcda07 (diff)
parent18f4871264f5e5d4ba0e1c42fb774da0ba3c6b61 (diff)
Merge branch 'devel' into feature/jessie
Conflicts: config/base_branch features/images/TailsGreeterTorConf.png features/step_definitions/apt.rb features/step_definitions/checks.rb features/step_definitions/common_steps.rb features/step_definitions/firewall_leaks.rb features/step_definitions/tor.rb features/support/helpers/misc_helpers.rb
Diffstat (limited to 'config/chroot_local-packageslists')
-rw-r--r--config/chroot_local-packageslists/tails-common.list4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index a055a45..cf7f137 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -82,6 +82,7 @@ dosfstools
eatmydata
ekeyd
electrum
+enigmail
eog
evince
exiv2
@@ -135,6 +136,8 @@ haveged
hdparm
hledger
hopenpgp-tools
+icedove
+icedove-l10n-all
inkscape
iptables
# ships isolinux.bin in syslinux 6.x packaging
@@ -233,6 +236,7 @@ vidalia
vim-nox
virtualbox-guest-utils
wireless-tools
+xul-ext-torbirdy
# needed for initramfs-tools' COMPRESS=xz
xz-utils