aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-07-21 07:00:39 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-07-21 07:00:39 +0000
commitd68d5faa05d53512f2786c0f1df5e71ea8213005 (patch)
tree8f721441cc76184923c1c15584c49d2fa5e54d74
parentrender: change baseline calculation, to center it within the line (diff)
parentmeson: bump version to 1.15.1 (diff)
Merge branch 'releases/1.15'
-rw-r--r--CHANGELOG.md15
-rw-r--r--meson.build2
2 files changed, 10 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bda563dd..c55f4eee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog
-* [Unreleased](#unreleased)
+* [1.15.1](#1-15-1)
* [1.15.0](#1-15-0)
* [1.14.0](#1-14-0)
* [1.13.1](#1-13-1)
@@ -43,8 +43,8 @@
* [1.2.0](#1-2-0)
-## Unreleased
-### Added
+## 1.15.1
+
### Changed
* When window is mapped, use metadata (DPI, scaling factor, subpixel
@@ -68,8 +68,6 @@
[1302]: https://codeberg.org/dnkl/foot/issues/1302
-### Deprecated
-### Removed
### Fixed
* Use appropriate rounding when applying fractional scales.
@@ -91,9 +89,14 @@
[1411]: https://codeberg.org/dnkl/foot/pulls/1411
-### Security
### Contributors
+* Ayush Agarwal
+* CismonX
+* Max Gautier
+* Ronan Pigott
+* xdavidwu
+
## 1.15.0
diff --git a/meson.build b/meson.build
index cdccfa7e..aeb2daa6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('foot', 'c',
- version: '1.15.0',
+ version: '1.15.1',
license: 'MIT',
meson_version: '>=0.59.0',
default_options: [