commit:     a31c6d4bd1112ac99635e008c62de7d4d43e2898
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo 
<DOT> org>
AuthorDate: Tue Apr 21 12:40:04 2015 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr 21 12:40:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=a31c6d4b

Merge branch 'master' of git+ssh://git.gentoo.org/proj/releng

 .../desktop/configs/loop-AES-kernel.patch          | 101 +++++++-------
 ...ardened-r1.config => 3.19.2-hardened-r1.config} | 146 ++++++++++++++-------
 tools-hardened/desktop/files/gnome-world           |  10 +-
 tools-hardened/desktop/files/kernel-config         |   2 +-
 .../desktop/files/portage/package.gnome.use.1      |   5 +-
 .../desktop/files/portage/package.gnome.use.2      |   5 +-
 tools-hardened/desktop/gnome3-run.sh               |   5 +
 tools-hardened/desktop/run-base.sh                 |   1 -
 tools-musl/portage.amd64.hardened/bashrc           |   2 +-
 tools-musl/portage.amd64.vanilla/bashrc            |   2 +-
 tools-musl/portage.armv7a.vanilla/bashrc           |   2 +-
 tools-musl/portage.i686.hardened/bashrc            |   2 +-
 tools-musl/portage.i686.vanilla/bashrc             |   2 +-
 tools-musl/portage.mips32r2.vanilla/bashrc         |   2 +-
 tools-musl/portage.mips32r2.vanilla/package.mask   |   5 +-
 tools-musl/portage.mipsel3.vanilla/bashrc          |   2 +-
 tools-musl/portage.mipsel3.vanilla/package.mask    |   4 +-
 17 files changed, 188 insertions(+), 110 deletions(-)

Reply via email to