diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-01 08:14:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-01 08:14:05 +0000 |
| commit | 6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03 (patch) | |
| tree | fd434665398565d3bb9c68b97c978b63a7756add /xorg-server/include/windowstr.h | |
| parent | d8f61fbb152bca029b56b117c679b03b6a72b467 (diff) | |
| parent | 30eaf03aef5847adb6da7efd4bbf4a4abaf5d738 (diff) | |
| download | vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.gz vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.tar.bz2 vcxsrv-6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include/windowstr.h')
| -rw-r--r-- | xorg-server/include/windowstr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h index b86b39bc2..79628710d 100644 --- a/xorg-server/include/windowstr.h +++ b/xorg-server/include/windowstr.h @@ -79,8 +79,8 @@ typedef struct _DevCursorNode { } DevCursNodeRec, *DevCursNodePtr, *DevCursorList;
typedef struct _WindowOpt {
- VisualID visual; /* default: same as parent */
CursorPtr cursor; /* default: window.cursorNone */
+ VisualID visual; /* default: same as parent */
Colormap colormap; /* default: same as parent */
Mask dontPropagateMask; /* default: window.dontPropagate */
Mask otherEventMasks; /* default: 0 */
|