summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-packageslists
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-02-09 11:23:43 +0000
committerTails developers <amnesia@boum.org>2013-02-09 11:23:43 +0000
commit330c345831a69f863dd24e436d0a09f9dbfde6bb (patch)
tree55605bc3581efc8ff3fada6afb7ef1921ce4adae /config/chroot_local-packageslists
parentc7497ddd7c818f673d8e87918fae54ba401c9840 (diff)
parent9ebb6b6e5cedd9087fb908b9a9a4615d99234a1f (diff)
Merge remote branch 'origin/feature/install-password-manager' 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 2046c6a..dfecbe3 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -112,6 +112,7 @@ inkscape
ipheth-utils
iptables
ferm
+keepassx
kexec-tools
memlockd
less