aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-04-27 18:08:55 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-04-27 18:08:55 +0000
commit0056c3426c36a9433f2b8459434a5b4432cae5a6 (patch)
tree8932b52c3234321f03c53856a013aa81e70aa211
parentchangelog: changed behavior of “extend-to-word-boundary” (diff)
parentmeson: bump version to 1.12.1 (diff)
Merge branch 'releases/1.12'
-rw-r--r--CHANGELOG.md12
-rw-r--r--meson.build2
2 files changed, 4 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c8c7511..4b964637 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog
-* [Unreleased](#unreleased)
+* [1.12.1](#1-12-1)
* [1.12.0](#1-12-0)
* [1.11.0](#1-11-0)
* [1.10.3](#1-10-3)
@@ -38,7 +38,8 @@
* [1.2.0](#1-2-0)
-## Unreleased
+## 1.12.1
+
### Added
* Workaround for Sway bug [#6960][sway-6960]: scrollback search and
@@ -60,8 +61,6 @@
natural.
-### Deprecated
-### Removed
### Fixed
* build: missing symbols when linking the `pgo` helper binary.
@@ -76,16 +75,11 @@
correctly.
* Sixel options not being reset on hard resets (`\Ec`)
-
[1040]: https://codeberg.org/dnkl/foot/issues/1040
[1036]: https://codeberg.org/dnkl/foot/issues/1036
[1047]: https://codeberg.org/dnkl/foot/issues/1036
-### Security
-### Contributors
-
-
## 1.12.0
### Added
diff --git a/meson.build b/meson.build
index 49611dcd..7280a049 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('foot', 'c',
- version: '1.12.0',
+ version: '1.12.1',
license: 'MIT',
meson_version: '>=0.58.0',
default_options: [