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, 105 insertions, 105 deletions

diff --git a/xorg-server/xkeyboard-config/docs/iso15924.csv b/xorg-server/xkeyboard-config/docs/iso15924.csv
index 0c751839b..60ee4ed9f 100644
--- a/xorg-server/xkeyboard-config/docs/iso15924.csv
+++ b/xorg-server/xkeyboard-config/docs/iso15924.csv
@@ -1,105 +1,105 @@
-Code,N°,"English Name","Nom français","Property Value Alias",Date
-Arab,160,Arabic,arabe,Arabic,38108
-Armn,230,Armenian,arménien,Armenian,38108
-Bali,360,Balinese,balinais,,38136
-Batk,365,Batak,batak,,38108
-Beng,325,Bengali,bengalî,Bengali,38108
-Blis,550,Blissymbols,"symboles Bliss",,38108
-Bopo,285,Bopomofo,bopomofo,Bopomofo,38108
-Brah,300,Brahmi,brâhmî,,38108
-Brai,570,Braille,braille,Braille,38108
-Bugi,367,Buginese,bouguis,,38108
-Buhd,372,Buhid,bouhide,Buhid,38108
-Cans,440,"Unified Canadian Aboriginal Syllabics","syllabaire autochtone canadien unifié",Canadian_Aboriginal,38136
-Cham,358,Cham,"cham (čam, tcham)",,38108
-Cher,445,Cherokee,tchérokî,Cherokee,38108
-Cirt,291,Cirth,cirth,,38108
-Copt,204,Coptic,copte,,38136
-Cprt,403,Cypriot,"syllabaire chypriote",Cypriot,38108
-Cyrl,220,Cyrillic,cyrillique,Cyrillic,38108
-Cyrs,221,"Cyrillic (Old Church Slavonic variant)","cyrillique (variante slavonne)",,38108
-Deva,315,"Devanagari (Nagari)",dévanâgarî,Devanagari,38108
-Dsrt,250,"Deseret (Mormon)","déseret (mormon)",Deseret,38108
-Egyd,70,"Egyptian demotic","démotique égyptien",,38108
-Egyh,60,"Egyptian hieratic","hiératique égyptien",,38108
-Egyp,50,"Egyptian hieroglyphs","hiéroglyphes égyptiens",,38108
-Ethi,430,"Ethiopic (Ge‘ez)","éthiopique (éthiopien, ge‘ez, guèze)",Ethiopic,38136
-Geor,240,"Georgian (Mkhedruli)","géorgien (mkhédrouli)",Georgian,38136
-Glag,225,Glagolitic,glagolitique,,38108
-Goth,206,Gothic,gotique,Gothic,38108
-Grek,200,Greek,grec,Greek,38108
-Gujr,320,Gujarati,"goudjarâtî (gujrâtî)",Gujarati,38108
-Guru,310,Gurmukhi,gourmoukhî,Gurmukhi,38108
-Hang,286,"Hangul (Hangŭl, Hangeul)","hangûl (hangŭl, hangeul)",Hangul,38136
-Hani,500,"Han (Hanzi, Kanji, Hanja)","idéogrammes han",Han,38108
-Hano,371,"Hanunoo (Hanunóo)",hanounóo,Hanunoo,38136
-Hans,501,"Han (Simplified variant)","idéogrammes han (variante simplifiée)",,38136
-Hant,502,"Han (Traditional variant)","idéogrammes han (variante traditionnelle)",,38136
-Hebr,125,Hebrew,hébreu,Hebrew,38108
-Hira,410,Hiragana,hiragana,Hiragana,38108
-Hmng,450,"Pahawh Hmong","pahawh hmong",,38108
-Hrkt,412,"(alias for Hiragana + Katakana)","(alias pour hiragana + katakana)",Katakana_Or_Hiragana,38108
-Hung,176,"Old Hungarian","ancien hongrois",,38108
-Inds,610,"Indus (Harappan)",indus,,38108
-Ital,210,"Old Italic (Etruscan, Oscan, etc.)","ancien italique (étrusque, osque, etc.)",Old_Italic,38136
-Java,361,Javanese,javanais,,38136
-Kali,357,"Kayah Li","kayah li",,38108
-Kana,411,Katakana,katakana,Katakana,38108
-Khar,305,Kharoshthi,kharochthî,,38136
-Khmr,355,Khmer,khmer,Khmer,38136
-Knda,345,Kannada,"kannara (canara)",Kannada,38136
-Laoo,356,Lao,laotien,Lao,38108
-Latf,217,"Latin (Fraktur variant)","latin (variante brisée)",,38108
-Latg,216,"Latin (Gaelic variant)","latin (variante gaélique)",,38108
-Latn,215,Latin,latin,Latin,38108
-Lepc,335,"Lepcha (Róng)","lepcha (róng)",,38108
-Limb,336,Limbu,limbou,Limbu,38136
-Lina,400,"Linear A","linéaire A",,38108
-Linb,401,"Linear B","linéaire B",Linear_B,38136
-Mand,140,Mandaean,mandéen,,38136
-Maya,90,"Mayan hieroglyphs","hiéroglyphes mayas",,38108
-Mero,100,Meroitic,méroïtique,,38108
-Mlym,347,Malayalam,malayâlam,Malayalam,38108
-Mong,145,Mongolian,mongol,Mongolian,38108
-Mymr,350,"Myanmar (Burmese)",birman,Myanmar,38108
-Ogam,212,Ogham,ogam,Ogham,38108
-Orkh,175,Orkhon,orkhon,,38108
-Orya,327,Oriya,oriyâ,Oriya,38108
-Osma,260,Osmanya,osmanais,Osmanya,38108
-Perm,227,"Old Permic","ancien permien",,38108
-Phag,331,Phags-pa,"’phags pa",,38136
-Phnx,115,Phoenician,phénicien,,38108
-Plrd,282,"Pollard Phonetic","phonétique de Pollard",,38108
-Qaaa,900,"Reserved for private use (start)","réservé à l’usage privé (début)",,38136
-Qabx,949,"Reserved for private use (end)","réservé à l’usage privé (fin)",,38136
-Roro,620,Rongorongo,rongorongo,,38108
-Runr,211,Runic,runique,Runic,38108
-Sara,292,Sarati,sarati,,38136
-Shaw,281,"Shavian (Shaw)","shavien (Shaw)",Shavian,38108
-Sinh,348,Sinhala,singhalais,Sinhala,38108
-Sylo,316,"Syloti Nagri","sylotî nâgrî",,38136
-Syrc,135,Syriac,syriaque,Syriac,38108
-Syre,138,"Syriac (Estrangelo variant)","syriaque (variante estranghélo)",,38108
-Syrj,137,"Syriac (Western variant)","syriaque (variante occidentale)",,38108
-Syrn,136,"Syriac (Eastern variant)","syriaque (variante orientale)",,38108
-Tagb,373,Tagbanwa,tagbanoua,Tagbanwa,38108
-Tale,353,"Tai Le","taï le",Tai_Le,38136
-Talu,354,"Tai Lue","taï lue",,38136
-Taml,346,Tamil,tamoul,Tamil,38108
-Telu,340,Telugu,télougou,Telugu,38108
-Teng,290,Tengwar,tengwar,,38108
-Tfng,120,"Tifinagh (Berber)","tifinagh (berbère)",,38108
-Tglg,370,Tagalog,tagal,Tagalog,38108
-Thaa,170,Thaana,thâna,Thaana,38108
-Thai,352,Thai,thaï,Thai,38108
-Tibt,330,Tibetan,tibétain,Tibetan,38108
-Ugar,40,Ugaritic,ougaritique,Ugaritic,38108
-Vaii,470,Vai,vaï,,38108
-Visp,280,"Visible Speech","parole visible",,38108
-Xpeo,30,"Old Persian","cunéiforme persépolitain",,38108
-Xsux,20,"Cuneiform, Sumero-Akkadian","cunéiforme suméro-akkadien",,38108
-Yiii,460,Yi,yi,Yi,38108
-Zxxx,997,"Code for unwritten languages","codet pour les langues non écrites",,38108
-Zyyy,998,"Code for undetermined script","codet pour écriture indéterminée",Common,38136
-Zzzz,999,"Code for uncoded script","codet pour écriture non codée",,38108
-Code,N°,"English Name","Nom français","Property Value Alias",Date
+Code,N°,"English Name","Nom français","Property Value Alias",Date

+Arab,160,Arabic,arabe,Arabic,38108

+Armn,230,Armenian,arménien,Armenian,38108

+Bali,360,Balinese,balinais,,38136

+Batk,365,Batak,batak,,38108

+Beng,325,Bengali,bengalî,Bengali,38108

+Blis,550,Blissymbols,"symboles Bliss",,38108

+Bopo,285,Bopomofo,bopomofo,Bopomofo,38108

+Brah,300,Brahmi,brâhmî,,38108

+Brai,570,Braille,braille,Braille,38108

+Bugi,367,Buginese,bouguis,,38108

+Buhd,372,Buhid,bouhide,Buhid,38108

+Cans,440,"Unified Canadian Aboriginal Syllabics","syllabaire autochtone canadien unifié",Canadian_Aboriginal,38136

+Cham,358,Cham,"cham (čam, tcham)",,38108

+Cher,445,Cherokee,tchérokî,Cherokee,38108

+Cirt,291,Cirth,cirth,,38108

+Copt,204,Coptic,copte,,38136

+Cprt,403,Cypriot,"syllabaire chypriote",Cypriot,38108

+Cyrl,220,Cyrillic,cyrillique,Cyrillic,38108

+Cyrs,221,"Cyrillic (Old Church Slavonic variant)","cyrillique (variante slavonne)",,38108

+Deva,315,"Devanagari (Nagari)",dévanâgarî,Devanagari,38108

+Dsrt,250,"Deseret (Mormon)","déseret (mormon)",Deseret,38108

+Egyd,70,"Egyptian demotic","démotique égyptien",,38108

+Egyh,60,"Egyptian hieratic","hiératique égyptien",,38108

+Egyp,50,"Egyptian hieroglyphs","hiéroglyphes égyptiens",,38108

+Ethi,430,"Ethiopic (Ge‘ez)","éthiopique (éthiopien, ge‘ez, guèze)",Ethiopic,38136

+Geor,240,"Georgian (Mkhedruli)","géorgien (mkhédrouli)",Georgian,38136

+Glag,225,Glagolitic,glagolitique,,38108

+Goth,206,Gothic,gotique,Gothic,38108

+Grek,200,Greek,grec,Greek,38108

+Gujr,320,Gujarati,"goudjarâtî (gujrâtî)",Gujarati,38108

+Guru,310,Gurmukhi,gourmoukhî,Gurmukhi,38108

+Hang,286,"Hangul (Hangŭl, Hangeul)","hangûl (hangŭl, hangeul)",Hangul,38136

+Hani,500,"Han (Hanzi, Kanji, Hanja)","idéogrammes han",Han,38108

+Hano,371,"Hanunoo (Hanunóo)",hanounóo,Hanunoo,38136

+Hans,501,"Han (Simplified variant)","idéogrammes han (variante simplifiée)",,38136

+Hant,502,"Han (Traditional variant)","idéogrammes han (variante traditionnelle)",,38136

+Hebr,125,Hebrew,hébreu,Hebrew,38108

+Hira,410,Hiragana,hiragana,Hiragana,38108

+Hmng,450,"Pahawh Hmong","pahawh hmong",,38108

+Hrkt,412,"(alias for Hiragana + Katakana)","(alias pour hiragana + katakana)",Katakana_Or_Hiragana,38108

+Hung,176,"Old Hungarian","ancien hongrois",,38108

+Inds,610,"Indus (Harappan)",indus,,38108

+Ital,210,"Old Italic (Etruscan, Oscan, etc.)","ancien italique (étrusque, osque, etc.)",Old_Italic,38136

+Java,361,Javanese,javanais,,38136

+Kali,357,"Kayah Li","kayah li",,38108

+Kana,411,Katakana,katakana,Katakana,38108

+Khar,305,Kharoshthi,kharochthî,,38136

+Khmr,355,Khmer,khmer,Khmer,38136

+Knda,345,Kannada,"kannara (canara)",Kannada,38136

+Laoo,356,Lao,laotien,Lao,38108

+Latf,217,"Latin (Fraktur variant)","latin (variante brisée)",,38108

+Latg,216,"Latin (Gaelic variant)","latin (variante gaélique)",,38108

+Latn,215,Latin,latin,Latin,38108

+Lepc,335,"Lepcha (Róng)","lepcha (róng)",,38108

+Limb,336,Limbu,limbou,Limbu,38136

+Lina,400,"Linear A","linéaire A",,38108

+Linb,401,"Linear B","linéaire B",Linear_B,38136

+Mand,140,Mandaean,mandéen,,38136

+Maya,90,"Mayan hieroglyphs","hiéroglyphes mayas",,38108

+Mero,100,Meroitic,méroïtique,,38108

+Mlym,347,Malayalam,malayâlam,Malayalam,38108

+Mong,145,Mongolian,mongol,Mongolian,38108

+Mymr,350,"Myanmar (Burmese)",birman,Myanmar,38108

+Ogam,212,Ogham,ogam,Ogham,38108

+Orkh,175,Orkhon,orkhon,,38108

+Orya,327,Oriya,oriyâ,Oriya,38108

+Osma,260,Osmanya,osmanais,Osmanya,38108

+Perm,227,"Old Permic","ancien permien",,38108

+Phag,331,Phags-pa,"’phags pa",,38136

+Phnx,115,Phoenician,phénicien,,38108

+Plrd,282,"Pollard Phonetic","phonétique de Pollard",,38108

+Qaaa,900,"Reserved for private use (start)","réservé à l’usage privé (début)",,38136

+Qabx,949,"Reserved for private use (end)","réservé à l’usage privé (fin)",,38136

+Roro,620,Rongorongo,rongorongo,,38108

+Runr,211,Runic,runique,Runic,38108

+Sara,292,Sarati,sarati,,38136

+Shaw,281,"Shavian (Shaw)","shavien (Shaw)",Shavian,38108

+Sinh,348,Sinhala,singhalais,Sinhala,38108

+Sylo,316,"Syloti Nagri","sylotî nâgrî",,38136

+Syrc,135,Syriac,syriaque,Syriac,38108

+Syre,138,"Syriac (Estrangelo variant)","syriaque (variante estranghélo)",,38108

+Syrj,137,"Syriac (Western variant)","syriaque (variante occidentale)",,38108

+Syrn,136,"Syriac (Eastern variant)","syriaque (variante orientale)",,38108

+Tagb,373,Tagbanwa,tagbanoua,Tagbanwa,38108

+Tale,353,"Tai Le","taï le",Tai_Le,38136

+Talu,354,"Tai Lue","taï lue",,38136

+Taml,346,Tamil,tamoul,Tamil,38108

+Telu,340,Telugu,télougou,Telugu,38108

+Teng,290,Tengwar,tengwar,,38108

+Tfng,120,"Tifinagh (Berber)","tifinagh (berbère)",,38108

+Tglg,370,Tagalog,tagal,Tagalog,38108

+Thaa,170,Thaana,thâna,Thaana,38108

+Thai,352,Thai,thaï,Thai,38108

+Tibt,330,Tibetan,tibétain,Tibetan,38108

+Ugar,40,Ugaritic,ougaritique,Ugaritic,38108

+Vaii,470,Vai,vaï,,38108

+Visp,280,"Visible Speech","parole visible",,38108

+Xpeo,30,"Old Persian","cunéiforme persépolitain",,38108

+Xsux,20,"Cuneiform, Sumero-Akkadian","cunéiforme suméro-akkadien",,38108

+Yiii,460,Yi,yi,Yi,38108

+Zxxx,997,"Code for unwritten languages","codet pour les langues non écrites",,38108

+Zyyy,998,"Code for undetermined script","codet pour écriture indéterminée",Common,38136

+Zzzz,999,"Code for uncoded script","codet pour écriture non codée",,38108

+Code,N°,"English Name","Nom français","Property Value Alias",Date