summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <sven.vermeulen@siphos.be>2014-04-17 21:04:07 +0200
committerSven Vermeulen <sven.vermeulen@siphos.be>2014-04-17 21:04:07 +0200
commit8fa5a13a6783e7a39e5c0ef042b4393d9edef17f (patch)
tree66f4820174337afc68195a76e6cabbce5c081d88
parentModule version bump for gnome keyring fix from Laurent Bigonville. (diff)
downloadhardened-refpolicy-8fa5a13a6783e7a39e5c0ef042b4393d9edef17f.tar.gz
hardened-refpolicy-8fa5a13a6783e7a39e5c0ef042b4393d9edef17f.tar.bz2
hardened-refpolicy-8fa5a13a6783e7a39e5c0ef042b4393d9edef17f.zip
Merging with upstream
-rw-r--r--gentoo/STATE4
1 files changed, 2 insertions, 2 deletions
diff --git a/gentoo/STATE b/gentoo/STATE
index 6bdbba32e..aebe597b8 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at b64bdd0a5179447f6c2a30c8081a403ea3816457
-master is at eabe0273c226b07dbecd21168cc9c7da51de8d4d
+contrib is at 2923fe4d0ff36840bbc2f473cf175db12da717ac
+master is at 76a9daf35aea332ec751e28564fc7bdb15ab613b