diff options
Diffstat (limited to 'dev-qt/qtgui/Manifest')
| -rw-r--r-- | dev-qt/qtgui/Manifest | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 28ea9f1e296f..caa14937747f 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -2,5 +2,9 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae0692 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 EBUILD qtgui-5.12.3-r1.ebuild 3719 BLAKE2B 6d8b24192afbda0c9f4955ef6127fa1b334cdfde00a8e78c9eeffc52496d0a8801642c21bc8dd730ed67373c32f738d4f804e6cc3a5901b38360eb39d15caf27 SHA512 5ad5f7b427fb989f0f3bbed475932808d7b598b53d9e16bd25bbb57ec75127c6ccc42295e26446be29516a881bd42989936c665ef48af2ff2c984d617aeb4a16 +<<<<<<< HEAD +EBUILD qtgui-5.12.4.ebuild 3866 BLAKE2B ad2901c3c6d701c11fce868f9a82e9f986b26fac54bd89a7b4727f0195ae2e881b5f2daa79f3fc433864d6de2daed9fed18aa58acbe9686b4ea523234bb801a1 SHA512 03c883fe4d9f8941b8274d08898ee9d0711719025d16550ed4b00a21e85000ec7edf14e805ad62fbb869a2b942ace5d0932af990128218390ae53954ebd40774 +======= +>>>>>>> next EBUILD qtgui-5.12.5.ebuild 3807 BLAKE2B 8a746b5c5fea17dbe9b67d80aa0b6ae31e6ed0a8e2a8837e5d39f738bf32030c2512cc6ccbf57af5425fcf6695177a28fbd9a2ddf98a2fc2b9e294137c378ad6 SHA512 f4d7fba9990fccc579b720c9361f81567e9faa1e5518a38a5ab32d6cf79b64d7b2cdbfc44979f0d8687ab0c47abeb48c10b547d2aed107b6413671f884ade87a MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a |