[Emacs-diffs] emacs-26 76f692e 2/2: Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26

[Eli Zaretskii]

branch: emacs-26
commit 76f692e82f13dc2d36e3636932f3998023a66289
Merge: ddd1b95 90bea37
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
---
 etc/PROBLEMS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 6b15ee9..1e103e9 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1293,7 +1293,7 @@ the resource prevents the problem.
 Version 2.6.4 of the FVWM can make a frame sticky (appear on all user
 desktops) when setting the 'sticky' frame parameter to nil.  This may
 happen without any special user interaction, for example, when Emacs
-restores a saved desktop.  A fix is to install version 2.6.7 of FVWM,
+restores a saved desktop.  A fix is to install version 2.6.8 of FVWM,
 see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31650.
 
 ** General X problems