diff options
Diffstat (limited to 'x11-base/xorg-server/Manifest')
| -rw-r--r-- | x11-base/xorg-server/Manifest | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index ca024deb26c7..4359c49e72ea 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -8,6 +8,11 @@ AUX xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch 3194 BLAKE2B 6ac AUX xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch 1724 BLAKE2B 34c607f6b6a6f21ed6b34d7a87cb3bc1774f526f32144218c7d5d338474c08c98c72a87b41f3d0afcaf81dc0e8d5989a48fd8e64a6a9e25ad968ad8156f6e984 SHA512 49d5af904bac03cfc8ad89b70541e9af6687f7f0153d06ada64e2226d27dddc1b7bb27024bed73c20c365197858957730de005c515bbae8e22b610c3241b70e4 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 +<<<<<<< HEAD EBUILD xorg-server-1.20.5.ebuild 5999 BLAKE2B 8693d6a1ecde9196c4355402b1d5cafbf45bee70364b65560417a6dea5fbfcca360b6980fef8fbc1fe3243743807e061a1b54cf5fbf8963f3cf9930ded6646fe SHA512 fe771c6b82d277db81233d02908e44321c2156380e75d1eeeb9fe806ca58367ec5291bfc04040cbc5019f0e11d94c99ec47562c447ba57aea17f5dd6d3d3eeec EBUILD xorg-server-9999.ebuild 5727 BLAKE2B c00c01f5b71cc0eb468fb78b45b6c0d8ab5c5393923bdd1ff7fd1daf271f8908d3ab2a62b7cd830a0c04eb88a1d46f13bdfc5d070b9e92f71d031740bcabb8d0 SHA512 d143eef70e356efd82d3a60d02fec9595d58e877a33e19e45ffc7c38ab566e61bf45bf2c8b11c8d998619298b0a15285218bc063e3875cf574cedade52ccc744 +======= +EBUILD xorg-server-1.20.5.ebuild 6092 BLAKE2B 8683b99a4044447db0d368591c4e04c76c2cc78d750494b761c7ae875c7c06bb1f96d046cb7bdb9b766c4c249c008c5e8ab2b9053efa7fc168cd727e14102cc7 SHA512 f9158c6f82840dfd12365baa2785039a027281482b21182bd66dd16557e272722d88806c1f27e5efb6a0b64d4c1ad45fb1674574ec64ab3e5567e5563c0467b2 +EBUILD xorg-server-9999.ebuild 5821 BLAKE2B d448bb1ce71de106744cb19a3d0e9b9d5ea5e5070f34a01989b4e35843aad5e524838b6b1ee9462ce22168019cc3cb61d049077ea6ba21d2be653db22e72ffea SHA512 23468b0c6d4bd0ffa763e87ae5ba6523ea079beaefe8e19aebb03603ae9e2ef49cf1c9ee58a9e327c95f71b0016f0027ac5a82f4d8ab6f380dbd8bf12a3e6e82 +>>>>>>> next MISC metadata.xml 1017 BLAKE2B 98dc828c96dc8fe30ef9314a6858aab7f25a0959d496f1c61802a38438902597c477ea1ae8018873958339ff936f0093651e4352db2e82fe4b77116365888d9f SHA512 695f5fefa689ccb192e43f9deab082bb4b18f68355d95e6b483e053451c87bb64a4d74c9e382e736e2900b9f4720613651f69831e8eefb2c1cd228b6284ae5c2 |