From: Justin Lecher Date: Wed, 16 Sep 2015 08:57:06 +0000 (+0200) Subject: Merge branch 'marbre-glm' X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7f52b7b04cadafc6a5b87818d4414dee79b36bdc;p=gentoo.git Merge branch 'marbre-glm' * marbre-glm: media-libs/glm: Fix remote-id media-libs/glm: Version bump, fixes #553156 and #538294 licenses: add HappyBunny license Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=553156 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=538294 Closes: Github gentoo/gentoo#83 Signed-off-by: Justin Lecher --- 7f52b7b04cadafc6a5b87818d4414dee79b36bdc