Merge remote-tracking branch 'upstream/master'

mikhailnov · Aug 28, 2018 · df4ef95 · df4ef95
2 parents 8c763ad + 9dcfa8a
commit df4ef95
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [4.3.1]
+### Fixed
+- One of the help images was not being installed
+
 ## [4.3.0]
 ### Added
 - The about dialog window "hide" method is explicitly called now. This may fix

diff --git a/data/com.github.wwmm.pulseeffects.appdata.xml.in b/data/com.github.wwmm.pulseeffects.appdata.xml.in
@@ -57,6 +57,7 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="4.3.1" date="2018-08-28"/>
     <release version="4.3.0" date="2018-08-28"/>
     <release version="4.2.9" date="2018-08-26"/>
     <release version="4.2.8" date="2018-08-14">

diff --git a/help/meson.build b/help/meson.build
@@ -46,7 +46,8 @@ help_media = [
   'figures/settingsmenu.png',
   'figures/userpresets.png',
   'figures/advancedinfo.png',
-  'figures/saturated.png'
+  'figures/saturated.png',
+  'figures/blacklist.png'
 ]
 
 gnome_mod.yelp(meson.project_name(),

diff --git a/meson.build b/meson.build
@@ -3,7 +3,7 @@ project(
 	'c',
 	'cpp',
 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
-	version: '4.3.0',
+	version: '4.3.1',
 	meson_version: '>= 0.40.0'
 )