diff options
Diffstat (limited to 'metadata/md5-cache/x11-wm')
| -rw-r--r-- | metadata/md5-cache/x11-wm/Manifest.gz | bin | 20021 -> 19712 bytes | |||
| -rw-r--r-- | metadata/md5-cache/x11-wm/twm-1.0.10 | 4 | ||||
| -rw-r--r-- | metadata/md5-cache/x11-wm/xoat-9999 | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz Binary files differindex d18345e07876..b5c16a44157e 100644 --- a/metadata/md5-cache/x11-wm/Manifest.gz +++ b/metadata/md5-cache/x11-wm/Manifest.gz diff --git a/metadata/md5-cache/x11-wm/twm-1.0.10 b/metadata/md5-cache/x11-wm/twm-1.0.10 index 029cc432f651..961c9e5b90f9 100644 --- a/metadata/md5-cache/x11-wm/twm-1.0.10 +++ b/metadata/md5-cache/x11-wm/twm-1.0.10 @@ -8,5 +8,9 @@ LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libICE x11-libs/libSM SLOT=0 SRC_URI=https://www.x.org/releases/individual/app/twm-1.0.10.tar.bz2 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 4d854e511b91b4119fc0e8e227cfcd98 +>>>>>>> next _md5_=0edf10b7eb709d2110f28003209a533b diff --git a/metadata/md5-cache/x11-wm/xoat-9999 b/metadata/md5-cache/x11-wm/xoat-9999 index 4e7fef546374..b7339e0b60b2 100644 --- a/metadata/md5-cache/x11-wm/xoat-9999 +++ b/metadata/md5-cache/x11-wm/xoat-9999 @@ -9,5 +9,9 @@ LICENSE=MIT PROPERTIES=live RDEPEND=x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama !savedconfig? ( x11-misc/dmenu ) SLOT=0 +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig 356fd0a7591e9b51742c209d13b729e1 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=b365628b38fbf283c9e1facbe888bf33 |