diff options
author | Dan Nicholson <dbn.lists@gmail.com> | 2010-06-28 08:09:49 -0700 |
---|---|---|
committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-06-28 08:09:49 -0700 |
commit | 52012140bffb725452eeeeb5913b553800c4ec32 (patch) | |
tree | 25b48c88bf878d6426bd3ae3709138f0e538b902 /xts5/Xlib12/XSendEvent.m | |
parent | 115dc059fd1a7d480ac37226ddf551059928d704 (diff) | |
parent | 9da20dd6962d6704f4c3517993b633392a3efadd (diff) |
Merge remote branch 'whot/master'
Conflicts:
xts5/Makefile.am
Moved the DISPLAY check to the top-level Makefile.am where check-local
is now defined.
Diffstat (limited to 'xts5/Xlib12/XSendEvent.m')
-rw-r--r-- | xts5/Xlib12/XSendEvent.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xts5/Xlib12/XSendEvent.m b/xts5/Xlib12/XSendEvent.m index 8e527edc..8296b771 100644 --- a/xts5/Xlib12/XSendEvent.m +++ b/xts5/Xlib12/XSendEvent.m @@ -151,7 +151,8 @@ static int event_types[] = { SelectionNotify, ColormapNotify, ClientMessage, - MappingNotify + MappingNotify, + GenericEvent }; >>ASSERTION Good A A call to xname |