On Sun, Sep 14, 2014 at 03:00:44PM +0100, Thomas Adam wrote: > On Sun, Sep 14, 2014 at 08:27:07AM -0500, c...@math.uh.edu wrote: > > CVSROOT: /home/cvs/fvwm > > Module name: fvwm > > Changes by: domivogt 14/09/14 08:27:07 > > > > Modified files: > > fvwm : Tag: branch-2_6 add_window.c add_window.h > > events.c functions.c > > > > Log message: > > * Fix handling of XA_WM_NORMAL_HINTS PropertyNotify (see ChangeLog). > > Am I being dense, or did you forget the ChangeLog?
I have a problem with a ChangeLog conflict that does not generate conflict markers. It may take some time to fix that. Ciao Dominik ^_^ ^_^ -- Dominik Vogt