summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-packageslists
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-11-13 19:20:52 +0000
committerTails developers <amnesia@boum.org>2012-11-13 19:20:52 +0000
commitd16b8a1c35a526599fc045ce2dda6ed9c619d8b9 (patch)
tree8b752b24d18ecc6ea2b74e0d6ca13a93940cdf50 /config/chroot_local-packageslists
parentb03374a7612698821883dd18bb6d591d82ca44a3 (diff)
parent787e635a1cb203186e5af784c483dfea9f80dc42 (diff)
Merge remote branch 'origin/feature/obfsproxy' into devel
Diffstat (limited to 'config/chroot_local-packageslists')
-rw-r--r--config/chroot_local-packageslists/tails-common.list1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 61f2b33..42e3e2b 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -128,6 +128,7 @@ nautilus-wipe
network-manager-gnome
ntfs-3g
ntfsprogs
+obfsproxy
openoffice.org-calc
openoffice.org-draw
openoffice.org-gnome