Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	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/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 70 insertions, 70 deletions

diff --git a/xorg-server/xkeyboard-config/BUGS b/xorg-server/xkeyboard-config/BUGS
index 285e01251..cb48ff636 100644
--- a/xorg-server/xkeyboard-config/BUGS
+++ b/xorg-server/xkeyboard-config/BUGS
@@ -1,70 +1,70 @@
--- Freedesktop.ORG

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=320

-http://bugs.xfree86.org/show_bug.cgi?id=1155

-

-	DONE: Added microsoftprousb

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=326

-http://bugs.xfree86.org/show_bug.cgi?id=1227

-

-	?: Which of 'inet' files is right?

-	

-http://freedesktop.org/bugzilla/show_bug.cgi?id=365

-

-	DONE: Two keysyms swapped in us(intl)

- 

-http://freedesktop.org/bugzilla/show_bug.cgi?id=371

-

-	?: What exactly is broken? Some patch would be nice

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=458

-

-	DONE: Changed Farsi to Iranian 

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=463

-

-	?: Don't know how to fix, really. Let's see.

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=496

-

-	DONE: Added Gyration Compact Keyboard

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=574

-

-	DONE: The patch applied

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=587

-

-	?: Which of altwin options should be included?

-	Some part of meta_win is already there

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=630

-

-	DONE: Logitech iTouch Cordless Keyboard (model Y-RB6) added

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=666

-

-	DONE: Long ago added alt_super_win

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=711

-

-	DONE: Added Super Power Multimedia Keyboard

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=743

-

-	DONE: Armenian fixed

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=744

-

-	DONE: Model a4techKB21 added

-

-http://freedesktop.org/bugzilla/show_bug.cgi?id=926

-

-	TODO:

--- GNOME

-

-http://bugzilla.gnome.org/show_bug.cgi?id=144646

-http://bugs.xfree86.org/show_bug.cgi?id=1415

-

-	DONE: Fixed, thanks to Dmitry

+-- Freedesktop.ORG
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=320
+http://bugs.xfree86.org/show_bug.cgi?id=1155
+
+	DONE: Added microsoftprousb
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=326
+http://bugs.xfree86.org/show_bug.cgi?id=1227
+
+	?: Which of 'inet' files is right?
+	
+http://freedesktop.org/bugzilla/show_bug.cgi?id=365
+
+	DONE: Two keysyms swapped in us(intl)
+ 
+http://freedesktop.org/bugzilla/show_bug.cgi?id=371
+
+	?: What exactly is broken? Some patch would be nice
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=458
+
+	DONE: Changed Farsi to Iranian 
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=463
+
+	?: Don't know how to fix, really. Let's see.
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=496
+
+	DONE: Added Gyration Compact Keyboard
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=574
+
+	DONE: The patch applied
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=587
+
+	?: Which of altwin options should be included?
+	Some part of meta_win is already there
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=630
+
+	DONE: Logitech iTouch Cordless Keyboard (model Y-RB6) added
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=666
+
+	DONE: Long ago added alt_super_win
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=711
+
+	DONE: Added Super Power Multimedia Keyboard
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=743
+
+	DONE: Armenian fixed
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=744
+
+	DONE: Model a4techKB21 added
+
+http://freedesktop.org/bugzilla/show_bug.cgi?id=926
+
+	TODO:
+-- GNOME
+
+http://bugzilla.gnome.org/show_bug.cgi?id=144646
+http://bugs.xfree86.org/show_bug.cgi?id=1415
+
+	DONE: Fixed, thanks to Dmitry