Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 73 insertions, 73 deletions

diff --git a/xorg-server/hw/kdrive/ephyr/README b/xorg-server/hw/kdrive/ephyr/README
index 6d6a222ef..7b26fcf33 100644
--- a/xorg-server/hw/kdrive/ephyr/README
+++ b/xorg-server/hw/kdrive/ephyr/README
@@ -1,73 +1,73 @@
-Xephyr README
-=============
-
-
-What Is It ?
-============
-
-Xephyr is a a kdrive server that outputs to a window on a pre-existing
-'host' X display. Think Xnest but with support for modern extensions
-like composite, damage and randr. 
-
-Unlike Xnest which is an X proxy, i.e.  limited to the
-capabilities of the host X server, Xephyr is a real X server which
-uses the host X server window as "framebuffer" via fast SHM XImages.
-
-It also has support for 'visually' debugging what the server is
-painting.
-
-
-How To Use 
-==========
-
-You probably want to run like;
-
-Xephyr :1 -ac -screen 800x600 &
-
-Then set DISPLAY=:1 and run whatever X apps you like.
-
-Use 'xrandr' to change to orientation/size. 
-
-There is a '-parent' switch which works just like Xnests ( for use
-with things like matchbox-nest - http://matchbox.handhelds.org ).
-
-There is also a '-host-cursor' switch to set 'cursor acceleration' -
-The host's cursor is reused. This is only really there to aid
-debugging by avoiding server paints for the cursor. Performance
-improvement is negiable. 
-
-Send a SIGUSR1 to the server ( eg kill -USR1 `pidof Xephyr` ) to
-toggle the debugging mode. In this mode red rectangles are painted to
-screen areas getting painted before painting the actual content. The
-delay between this can be altered by setting a XEPHYR_PAUSE env var to
-a value in micro seconds.
-
-
-Caveats
-=======
-
- - Depth is limited to being the same as the host. 
-   *Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp 
-            on 24bpp host.
-
- - Rotated displays are currently updated via full blits. This
-   is slower than a normal oprientated display. Debug mode will
-   therefor not be of much use rotated.  
-
- - The '-host-cursor' cursor is static in its appearence. 
-
- - The build gets a warning about 'nanosleep'. I think the various '-D'
-   build flags are causing this. I havn't figured as yet how to work
-   round it. It doesn't appear to break anything however. 
-
- - Keyboard handling is basic but works. 
-
- - Mouse button 5 probably wont work. 
-
-
-
-
-
-Matthew Allum <mallum@o-hand.com> 2004 
-
-
+Xephyr README

+=============

+

+

+What Is It ?

+============

+

+Xephyr is a a kdrive server that outputs to a window on a pre-existing

+'host' X display. Think Xnest but with support for modern extensions

+like composite, damage and randr. 

+

+Unlike Xnest which is an X proxy, i.e.  limited to the

+capabilities of the host X server, Xephyr is a real X server which

+uses the host X server window as "framebuffer" via fast SHM XImages.

+

+It also has support for 'visually' debugging what the server is

+painting.

+

+

+How To Use 

+==========

+

+You probably want to run like;

+

+Xephyr :1 -ac -screen 800x600 &

+

+Then set DISPLAY=:1 and run whatever X apps you like.

+

+Use 'xrandr' to change to orientation/size. 

+

+There is a '-parent' switch which works just like Xnests ( for use

+with things like matchbox-nest - http://matchbox.handhelds.org ).

+

+There is also a '-host-cursor' switch to set 'cursor acceleration' -

+The host's cursor is reused. This is only really there to aid

+debugging by avoiding server paints for the cursor. Performance

+improvement is negiable. 

+

+Send a SIGUSR1 to the server ( eg kill -USR1 `pidof Xephyr` ) to

+toggle the debugging mode. In this mode red rectangles are painted to

+screen areas getting painted before painting the actual content. The

+delay between this can be altered by setting a XEPHYR_PAUSE env var to

+a value in micro seconds.

+

+

+Caveats

+=======

+

+ - Depth is limited to being the same as the host. 

+   *Update* As of 8/11/2004. Xephyr can now do 8bpp & 16bpp 

+            on 24bpp host.

+

+ - Rotated displays are currently updated via full blits. This

+   is slower than a normal oprientated display. Debug mode will

+   therefor not be of much use rotated.  

+

+ - The '-host-cursor' cursor is static in its appearence. 

+

+ - The build gets a warning about 'nanosleep'. I think the various '-D'

+   build flags are causing this. I havn't figured as yet how to work

+   round it. It doesn't appear to break anything however. 

+

+ - Keyboard handling is basic but works. 

+

+ - Mouse button 5 probably wont work. 

+

+

+

+

+

+Matthew Allum <mallum@o-hand.com> 2004 

+

+