diff options
Diffstat (limited to 'media-libs/libglvnd/Manifest')
| -rw-r--r-- | media-libs/libglvnd/Manifest | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest index d967f76be13d..a08b7a0bbb23 100644 --- a/media-libs/libglvnd/Manifest +++ b/media-libs/libglvnd/Manifest @@ -1,7 +1,11 @@ +<<<<<<< HEAD AUX libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch 6596 BLAKE2B 0528a825fbbfe8c7530e841c1542a9a4d3e08159abc379f09df3789ccbde583243c1ed478ab14638ffef7b7949090a24b2a9204cb5b4641f8b9bef4e1540bd3d SHA512 5c3ea6d4f0c683945ff2178fe43cc2ac3876bba5f66dc9291a8129213ba3235a732fe86b53bfeeb5df08134ed782967027b7387c12e9bc1a1be795e0c1400a55 DIST libglvnd-1.1.1.tar.gz 1851222 BLAKE2B 58a6e997b64bd22c4af0136fb37959f45df4a738bfcff205d7efb7ac08e7897a19164cb36f11d556c5a1bd3d46f0f1df3f89a36b7352b8a880c3570b2cf462cf SHA512 9106ae3cd3bdce8f4def3c7e08645f76e1a65f51e184510088e79b834899061d357422376e0efd56e1bc9dc7d3150f74837f43bd3e6c4c44faa3859844ab21b7 DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c EBUILD libglvnd-1.1.1-r1.ebuild 1050 BLAKE2B e01e103c7c4a719cfce84ffd9fe061646cecaac2a3cbdb34fbdf316f373c3f25c3dc398d3437aba41887a08c454f1c6799ff9221bee2d4c31a6f9ee5108d237a SHA512 fb754f35e79185a66351fbe62e82d4613a9c2a218c05354d58d5648e1358a3f29ae3018bfafcaa7487bec3a528c7354f16d57d16733563473138f35a868e034c +======= +DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c +>>>>>>> next EBUILD libglvnd-1.2.0.ebuild 1155 BLAKE2B 9d48e9c1637a31fb33d99cf674c22c73f7e2b7d8a746d3644c8b6113fe982b9848f3936f4900aa312d30c89dc4b1898da4daba6ccfaab694fee37a728f63ef2f SHA512 40c9c5e70595266c6835bece0765191767b5e3811fe49e86e94821cb44914351f812c7f4e9c7619ec8892f165b669fc9001e29a9c866304a081d81a33313d455 EBUILD libglvnd-9999.ebuild 1199 BLAKE2B 029902c0c826c0ee71314c1a9c24fe022a04327bf5addd80bc937e9007bcd4e043a29dd94de5810b4d385ecbb68229d27ac05aa51d9c7a1417a61076f77dda74 SHA512 9b84a3b424481d5c069444bb76e2d2c9572b058e245ef4145a6833ad891b6aac3e95417e5c844da7ee7ec2fc8471871bba4dc4441f02c2e21308482def70169d MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c |