summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/games-strategy/colobot-data-0.1.11
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/games-strategy/colobot-data-0.1.11')
-rw-r--r--metadata/md5-cache/games-strategy/colobot-data-0.1.114
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/games-strategy/colobot-data-0.1.11 b/metadata/md5-cache/games-strategy/colobot-data-0.1.11
index cbbc4d8c7d75..7ed700df17a3 100644
--- a/metadata/md5-cache/games-strategy/colobot-data-0.1.11
+++ b/metadata/md5-cache/games-strategy/colobot-data-0.1.11
@@ -9,5 +9,9 @@ LICENSE=GPL-3
REQUIRED_USE=music? ( ^^ ( music-flac-convert music-ogg ) ) music-flac-convert? ( music ) music-ogg? ( music )
SLOT=0
SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.11-alpha.tar.gz -> colobot-data-0.1.11.tar.gz music-ogg? ( https://colobot.info/files/music/colobot-music_ogg_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-ogg.tar.gz ) music-flac-convert? ( https://colobot.info/files/music/colobot-music_flac_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-flac.tar.gz )
+<<<<<<< HEAD
_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+=======
+_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
+>>>>>>> next
_md5_=3e4bfcfe34f1b8c9d45ac40dec711fa4