summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/dev-libs/intel-neo-19.30.13641
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/dev-libs/intel-neo-19.30.13641')
-rw-r--r--metadata/md5-cache/dev-libs/intel-neo-19.30.136414
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/dev-libs/intel-neo-19.30.13641 b/metadata/md5-cache/dev-libs/intel-neo-19.30.13641
index 81aac33a2eb3..e8c5d07f79d6 100644
--- a/metadata/md5-cache/dev-libs/intel-neo-19.30.13641
+++ b/metadata/md5-cache/dev-libs/intel-neo-19.30.13641
@@ -10,5 +10,9 @@ LICENSE=MIT
RDEPEND=dev-libs/ocl-icd dev-util/intel-graphics-compiler >=media-libs/gmmlib-19.2.3 vaapi? ( x11-libs/libdrm[video_cards_intel] >=x11-libs/libva-2.0.0 )
SLOT=0
SRC_URI=https://github.com/intel/compute-runtime/archive/19.30.13641.tar.gz -> intel-neo-19.30.13641.tar.gz
+<<<<<<< HEAD
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=4c102b5632a877854745c336fbb3ece9