commit: 10a062385bb1d89e44170423a7302cb5247d2dff Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Fri May 27 02:43:18 2016 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Fri May 27 02:43:18 2016 +0000 URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=10a06238
Merge branch 'heroxbd' into android dev-util/bakefile/ChangeLog | 19 - dev-util/bakefile/Manifest | 6 - dev-util/bakefile/bakefile-0.2.8.ebuild | 30 - dev-util/bakefile/bakefile-0.2.9.ebuild | 30 - dev-util/bakefile/metadata.xml | 5 - sys-libs/glibc/ChangeLog | 1513 ------------- sys-libs/glibc/ChangeLog-2007 | 2665 ----------------------- sys-libs/glibc/Manifest | 8 +- sys-libs/glibc/files/eblits/common.eblit | 27 +- sys-libs/glibc/files/eblits/src_configure.eblit | 24 +- sys-libs/glibc/files/eblits/src_install.eblit | 4 +- sys-libs/talloc/ChangeLog | 91 - sys-libs/talloc/Manifest | 4 - sys-libs/talloc/metadata.xml | 13 - sys-libs/talloc/talloc-2.0.5.ebuild | 31 - www-servers/nginx/ChangeLog | 1789 --------------- www-servers/nginx/Manifest | 15 - www-servers/nginx/files/nginx.conf | 72 - www-servers/nginx/files/nginx.initd | 87 - www-servers/nginx/files/nginx.logrotate | 11 - www-servers/nginx/metadata.xml | 27 - www-servers/nginx/nginx-1.2.0.ebuild | 379 ---- 22 files changed, 16 insertions(+), 6834 deletions(-)