summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaman <jason@perfinion.com>2014-12-04 20:44:38 +0400
committerJason Zaman <jason@perfinion.com>2014-12-04 20:44:38 +0400
commit456c24a821eae870bffb5a5ecae8f1d52df64004 (patch)
tree6f8e295910139121d9483d8fabee9a10d4b890a5
parentUpdate Changelog for release. (diff)
downloadhardened-refpolicy-456c24a821eae870bffb5a5ecae8f1d52df64004.tar.gz
hardened-refpolicy-456c24a821eae870bffb5a5ecae8f1d52df64004.tar.bz2
hardened-refpolicy-456c24a821eae870bffb5a5ecae8f1d52df64004.zip
Merge Upstream
-rw-r--r--gentoo/STATE4
1 files changed, 2 insertions, 2 deletions
diff --git a/gentoo/STATE b/gentoo/STATE
index a49ebd56..3c276933 100644
--- a/gentoo/STATE
+++ b/gentoo/STATE
@@ -1,2 +1,2 @@
-contrib is at 031a4f0ae7c5c86adf2402be2f495e4700aa789d
-master is at 0735f2ca4af063c1a1d6d955dc38b300bcce9345
+contrib is at f627e84f52f62f4872889987ee32c903c3b7dc96
+master is at 960e6cd4e85ae8d39f7459afe066c2fe1ad0da8c