summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS13
-rw-r--r--configure.ac2
-rw-r--r--meson.build2
3 files changed, 15 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index e8954b1e..4a740701 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+### marco 1.26.1
+
+ * update translations
+ * replace _NET_WM_PID with XResGetClientPid
+ * Always bring into foreground the previous window after closing one
+ * window: do not disable fullscreen for dialogs
+ * theme: fix memory leak
+ * compositor-xrender: fix memory leak
+ * build: fix meson build
+ * prefs: fix memory leak
+ * fix code-formatting issue of previous commit
+ * Safeguard against calling gdk_x11_window_get_xid with a NULL GdkWindow
+
### marco 1.26.0
* update translations
diff --git a/configure.ac b/configure.ac
index d5002477..f077cce6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
m4_define([marco_major_version], [1])
m4_define([marco_minor_version], [26])
-m4_define([marco_micro_version], [0])
+m4_define([marco_micro_version], [1])
m4_define([marco_version],
[marco_major_version.marco_minor_version.marco_micro_version])
diff --git a/meson.build b/meson.build
index 199baa77..b38d2858 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project(
'marco', 'c',
- version: '1.26.0',
+ version: '1.26.1',
meson_version: '>=0.47.0',
license: 'GPL2',
default_options : [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11'],