diff options
author | Jason Zaman <jason@perfinion.com> | 2017-03-30 22:01:18 +0800 |
---|---|---|
committer | Jason Zaman <jason@perfinion.com> | 2017-03-30 22:01:18 +0800 |
commit | 3eab238d3953972d41ff559674147d51b4ed3bba (patch) | |
tree | d2966c3dc18bc58737e883f76ca3b0c919bc34a6 | |
parent | systemd-resolvd, sessions, and tmpfiles take2 (diff) | |
download | hardened-refpolicy-3eab238d.tar.gz hardened-refpolicy-3eab238d.tar.bz2 hardened-refpolicy-3eab238d.zip |
Merge upstream
-rw-r--r-- | gentoo/STATE | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gentoo/STATE b/gentoo/STATE index b75757eeb..7626723cf 100644 --- a/gentoo/STATE +++ b/gentoo/STATE @@ -1,2 +1,2 @@ -master 2f3691e4c808f8f4653595c20276f4f68b32535a -contrib 1ea381eab188e59d2691ccb87512086cb3385778 +master 160d08f3aec78012b89155ea7fc26368ce4a597c +contrib 2128180acf3e02131dfb02d7cf1835d0a1f62b1b |