commit: 0c018e78723be545c7cbfde686ddd376cd4f584c Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> AuthorDate: Tue Feb 9 07:17:35 2016 +0000 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> CommitDate: Tue Feb 9 07:17:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c018e78
Merge remote-tracking branch 'remotes/jbergstroem/fix/dev-libs/ucl-conflict' Pull request: https://github.com/gentoo/gentoo/pull/819 dev-libs/libucl/libucl-0.7.3.ebuild | 3 ++- dev-libs/ucl/ucl-1.03-r1.ebuild | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-)
