diff options
Diffstat (limited to 'metadata/md5-cache/games-strategy/colobot-0.1.12')
| -rw-r--r-- | metadata/md5-cache/games-strategy/colobot-0.1.12 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/metadata/md5-cache/games-strategy/colobot-0.1.12 b/metadata/md5-cache/games-strategy/colobot-0.1.12 index a3c124dab1f8..30805fdf5a05 100644 --- a/metadata/md5-cache/games-strategy/colobot-0.1.12 +++ b/metadata/md5-cache/games-strategy/colobot-0.1.12 @@ -11,5 +11,9 @@ RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg me RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.12-alpha.tar.gz +<<<<<<< HEAD _eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +======= +_eclasses_=cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg-utils ff2ff954e6b17929574eee4efc5152ba +>>>>>>> next _md5_=8ab33d4826363e3efac7547630c47b17 |