release 1.21.1v1.21.1

2 files changed, 40 insertions, 13 deletions

diff --git a/NEWS b/NEWS
index d78623d1..75a46499 100644
--- a/NEWS
+++ b/NEWS
@@ -1,17 +1,44 @@
+### marco 1.21.1
+
+  * update translations
+  * theme: revert theme format version 3.6
+  * doc: add info for 3.5 and 3.6 theme format versions
+  * Convert frame region handling to cairo regions
+  * theme: add invisible_border to metacity theme
+  * add support for app-menu button in theme
+  * remove option to attach modal dialogs
+  * theme: replace mutter/metacity with marco
+  * theme: Replace char array element comparisons with strncmp
+  * tabpopup.c: always show 5px outline border
+  * tabpopup.c: improve
+  * Don't show the ws switcher if we only have one
+  * theme: Allow disabling fallback colors in gtk:custom()
+  * theme: Allow using custom colors from the GTK+ theme
+  * theme: Add tiled_left/tiled_right frame states
+  * theme: Add background functions for single buttons
+  * theme-parser: Use peek_required_version() for validation
+  * Add frame type for attached modal dialogs
+  * Optionally attach modal dialogs
+  * Add meta_window_get_transient_for() method
+  * Allow a theme to specify ellipsize width for a title
+  * Add frame_x_center/frame_y_center variables for themes
+  * metacity-theme-3.xml: Add a flexible version mechanism
+  * theme-parser: Remove unused define
+
 ### marco 1.21.0
 
-    sync with transifex
-    Correct resize popup position on HiDPI displays
-    Fix frame geometry to avoid stuck resize cursor
-    Scale cursor size for HiDPI
-    tx: update config with branch specific resoures
-    Use frame window to determine scale
-    Support HiDPI window decorations
-    Fix mismatched enums in keybinding detection for switch-panels and switch-panels-backward
-    window: add _NET_WM_STATE_FOCUSED hint to _NET_WM_STATE
-    avoid deprecated GtkButton:use-stock
-    avoid deprecated GtkStock
-    Fixes move_to_center moving window between monitors
+  * update translations
+  * Correct resize popup position on HiDPI displays
+  * Fix frame geometry to avoid stuck resize cursor
+  * Scale cursor size for HiDPI
+  * tx: update config with branch specific resoures
+  * Use frame window to determine scale
+  * Support HiDPI window decorations
+  * Fix mismatched enums in keybinding detection for switch-panels and switch-panels-backward
+  * window: add _NET_WM_STATE_FOCUSED hint to _NET_WM_STATE
+  * avoid deprecated GtkButton:use-stock
+  * avoid deprecated GtkStock
+  * Fixes move_to_center moving window between monitors
 
 ### marco 1.20.0
 
diff --git a/configure.ac b/configure.ac
index 92bd9536..7549b155 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], [21])
-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])