diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-27 08:37:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-27 08:37:02 +0200 |
| commit | 2233c44285f7e820f04abd07d6cf5eedbe32b8a3 (patch) | |
| tree | 80d64c8daf68c57aaf3b6937cbd075161deaa3d2 /xorg-server/include/xserver-properties.h | |
| parent | 95acf9816e008fa46a6c2fa2f35500deb358bb69 (diff) | |
| parent | 183b7373f9919eeb5eb408f38578e01717b2cc10 (diff) | |
| download | vcxsrv-2233c44285f7e820f04abd07d6cf5eedbe32b8a3.tar.gz vcxsrv-2233c44285f7e820f04abd07d6cf5eedbe32b8a3.tar.bz2 vcxsrv-2233c44285f7e820f04abd07d6cf5eedbe32b8a3.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/version.c
xorg-server/include/globals.h
xorg-server/mi/misprite.c
xorg-server/mi/mivaltree.c
xorg-server/os/utils.c
Diffstat (limited to 'xorg-server/include/xserver-properties.h')
| -rw-r--r-- | xorg-server/include/xserver-properties.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xorg-server/include/xserver-properties.h b/xorg-server/include/xserver-properties.h index 2b1feabb6..bf50042d0 100644 --- a/xorg-server/include/xserver-properties.h +++ b/xorg-server/include/xserver-properties.h @@ -30,6 +30,9 @@ * byte-ordering. */ #define XATOM_FLOAT "FLOAT" +/* STRING. Seat name of this display */ +#define SEAT_ATOM_NAME "Xorg_Seat" + /* BOOL. 0 - device disabled, 1 - device enabled */ #define XI_PROP_ENABLED "Device Enabled" /* BOOL. If present, device is a virtual XTEST device */ |