Merge branch 'releases/1.5' into master

This commit is contained in:
Daniel Eklöf 2020-09-05 09:27:20 +02:00
commit f3db670455
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 4 additions and 4 deletions

View file

@ -15,7 +15,7 @@
* **Experimental**: 'river': new module for the river Wayland compositor. * **Experimental**: 'river': new module for the river Wayland compositor.
## Changed ### Changed
* Requires fcft-2.2.x. * Requires fcft-2.2.x.
* battery: a poll value of 0 disables polling. * battery: a poll value of 0 disables polling.

View file

@ -1,5 +1,5 @@
pkgname=yambar pkgname=yambar
pkgver=1.4.0 pkgver=1.5.0
pkgrel=1 pkgrel=1
pkgdesc="Simplistic and highly configurable status panel for X and Wayland" pkgdesc="Simplistic and highly configurable status panel for X and Wayland"
arch=('x86_64' 'aarch64') arch=('x86_64' 'aarch64')

View file

@ -1,5 +1,5 @@
pkgname=yambar-wayland pkgname=yambar-wayland
pkgver=1.4.0 pkgver=1.5.0
pkgrel=1 pkgrel=1
pkgdesc="Simplistic and highly configurable status panel for Wayland" pkgdesc="Simplistic and highly configurable status panel for Wayland"
arch=('x86_64' 'aarch64') arch=('x86_64' 'aarch64')

View file

@ -1,5 +1,5 @@
project('yambar', 'c', project('yambar', 'c',
version: '1.4.0', version: '1.5.0',
license: 'MIT', license: 'MIT',
meson_version: '>=0.53.0', meson_version: '>=0.53.0',
default_options: ['c_std=c18', default_options: ['c_std=c18',