mirror of
https://gitlab.com/samplehive/sample-hive.git
synced 2026-10-15 09:24:12 +02:00
Fixing merge conflict
This commit is contained in:
@@ -12,6 +12,8 @@ packages:
|
|||||||
- libtag1-dev
|
- libtag1-dev
|
||||||
- libtagc0
|
- libtagc0
|
||||||
- libexif-dev
|
- libexif-dev
|
||||||
|
- libpango1.0-dev
|
||||||
|
- pkg-config
|
||||||
- git
|
- git
|
||||||
- meson
|
- meson
|
||||||
- g++
|
- g++
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ endforeach
|
|||||||
|
|
||||||
wx = dependency('wxwidgets', version: '>=3.0.4')
|
wx = dependency('wxwidgets', version: '>=3.0.4')
|
||||||
wxsvg = dependency('libwxsvg')
|
wxsvg = dependency('libwxsvg')
|
||||||
taglib = dependency('taglib', version: '>=1.12')
|
taglib = dependency('taglib', version: '>=1.11')
|
||||||
sqlite3 = dependency('sqlite3')
|
sqlite3 = dependency('sqlite3')
|
||||||
yaml = dependency('yaml-cpp')
|
yaml = dependency('yaml-cpp')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user