Skip to content
Snippets Groups Projects
Commit 5f3ce896 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

avoid conflicts

parent 9c4f68a3
No related branches found
No related tags found
1 merge request!460Add opencv package to bob-devel and bump versions
...@@ -70,9 +70,9 @@ zip_keys: ...@@ -70,9 +70,9 @@ zip_keys:
# The dependencies that we link against (host requirements). # The dependencies that we link against (host requirements).
ffmpeg: ffmpeg:
- 4.2 - 4.2.2
freetype: freetype:
- 2.10 - 2.10.4
glib: glib:
- 2.63.1 - 2.63.1
harfbuzz: harfbuzz:
...@@ -82,16 +82,16 @@ hdf5: ...@@ -82,16 +82,16 @@ hdf5:
jasper: jasper:
- 2.0.14 - 2.0.14
jpeg: jpeg:
- 9 - 9b
libpng: libpng:
- 1.6 - 1.6.37
libtiff: libtiff:
- 4.1 - 4.1.0
mkl: mkl:
- 2019 - 2019.4
numpy: numpy:
- 1.16 - 1.16
xz: xz:
- 5 - 5.2.5
zlib: zlib:
- 1.2 - 1.2.11
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment