svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 0 insertions, 683 deletions

diff --git a/xorg-server/xkbdata.src/rules/base.lst b/xorg-server/xkbdata.src/rules/base.lst
deleted file mode 100644
index 4986c4dc4..000000000
--- a/xorg-server/xkbdata.src/rules/base.lst
+++ /dev/null
@@ -1,683 +0,0 @@
-! model
-  pc101           
-  pc102           
-  pc104           
-  pc105           
-  dell101         
-  latitude        
-  dellm65         
-  everex          
-  flexpro         
-  microsoft       
-  omnikey101      
-  winbook         
-  jp106           
-  pc98            
-  a4techKB21      
-  a4techKBS8      
-  a4_rfkb23       
-  abnt2           
-  airkey          
-  acpi            
-  azonaRF2300     
-  scorpius        
-  brother         
-  btc5113rf       
-  btc5126t        
-  btc6301urf      
-  btc9000         
-  btc9000a        
-  btc9001ah       
-  btc5090         
-  btc9019u        
-  cherryblue      
-  cherryblueb     
-  cherrybluea     
-  cherrycyboard   
-  chicony         
-  chicony0108     
-  chicony9885     
-  compaqeak8      
-  compaqik7       
-  compaqik13      
-  compaqik18      
-  cymotionlinux   
-  armada          
-  presario        
-  ipaq            
-  dell            
-  dellsk8125      
-  dellsk8135      
-  dellusbmm       
-  inspiron        
-  precision_m     
-  dexxa           
-  diamond         
-  dtk2000         
-  ennyah_dkb1008  
-  fscaa1667g      
-  genius          
-  geniuscomfy     
-  geniuscomfy2    
-  geniuskb19e     
-  gyration        
-  logitech_base   
-  logitech_g15    
-  hpi6            
-  hp2501          
-  hp2505          
-  hpxe3gc         
-  hpxe3gf         
-  hpxt1000        
-  hpzt11xx        
-  hp500fa         
-  hp5xx           
-  hp5181          
-  hp5185          
-  hpnx9020        
-  hp6000          
-  honeywell_euroboard 
-  rapidaccess     
-  rapidaccess2    
-  rapidaccess2a   
-  thinkpad        
-  thinkpadintl    
-  thinkpad60      
-  thinkpadz60     
-  ibm_spacesaver  
-  logiaccess      
-  logiclx300      
-  logii350        
-  logimel         
-  logicd          
-  logicd_it       
-  logicd_nav      
-  logicd_opt      
-  logicda         
-  logicdpa2       
-  logicfn         
-  logicdn         
-  logiitc         
-  logiik          
-  itouch          
-  logicink        
-  logiex110       
-  logiinkse       
-  logiinkseusb    
-  logiultrax      
-  logiultraxc     
-  logidinovo      
-  logidinovoedge  
-  mx1998          
-  mx2500          
-  mx2750          
-  microsoft7000   
-  microsoftinet   
-  microsoftpro    
-  microsoftprousb 
-  microsoftprooem 
-  vsonku306       
-  microsoftprose  
-  microsoftoffice 
-  microsoftmult   
-  microsoftelite  
-  oretec          
-  propeller       
-  qtronix         
-  samsung4500     
-  samsung4510     
-  sk1300          
-  sk2500          
-  sk6200          
-  sk7100          
-  sp_inet         
-  sven            
-  sven303         
-  symplon         
-  toshiba_s3000   
-  trust           
-  trustda         
-  yahoo           
-  macbook78       
-  macbook79       
-  macintosh       
-  macintosh_old   
-  macintosh_hhk   
-  acer_c300       
-  acer_ferrari4k  
-  acer_laptop     
-  asus_laptop     
-  apple           
-  apple_laptop    
-  silvercrest     
-  emachines       
-  kr106           
-  evdev           
-  benqx           
-  benqx730        
-  benqx800        
-  hhk             
-  classmate       
-  olpc            
-  sun6            
-
-! layout
-  us              
-  ad              
-  af              
-  ara             
-  al              
-  am              
-  az              
-  by              
-  be              
-  bd              
-  in              
-  ba              
-  br              
-  bg              
-  ma              
-  mm              
-  ca              
-  cd              
-  cn              
-  hr              
-  cz              
-  dk              
-  nl              
-  bt              
-  ee              
-  ir              
-  iq              
-  fo              
-  fi              
-  fr              
-  gh              
-  gn              
-  ge              
-  de              
-  gr              
-  hu              
-  is              
-  il              
-  it              
-  jp              
-  kg              
-  kh              
-  kz              
-  la              
-  latam           
-  lt              
-  lv              
-  mao             
-  me              
-  mk              
-  mt              
-  mn              
-  no              
-  pl              
-  pt              
-  ro              
-  ru              
-  rs              
-  si              
-  sk              
-  es              
-  se              
-  ch              
-  sy              
-  tj              
-  lk              
-  th              
-  tr              
-  ua              
-  gb              
-  uz              
-  vn              
-  kr              
-  nec_vndr/jp     
-  ie              
-  pk              
-  mv              
-  za              
-  epo             
-  np              
-  ng              
-  et              
-  braille         
-
-! variant
-  chr             us: 
-  euro            us: 
-  intl            us: 
-  alt-intl        us: 
-  colemak         us: 
-  dvorak          us: 
-  dvorak-intl     us: 
-  dvorak-l        us: 
-  dvorak-r        us: 
-  dvorak-classic  us: 
-  dvp             us: 
-  rus             us: 
-  mac             us: 
-  altgr-intl      us: 
-  olpc2           us: 
-  ps              af: 
-  uz              af: 
-  olpc-ps         af: 
-  olpc-fa         af: 
-  olpc-uz         af: 
-  azerty          ara: 
-  azerty_digits   ara: 
-  digits          ara: 
-  qwerty          ara: 
-  qwerty_digits   ara: 
-  buckwalter      ara: 
-  phonetic        am: 
-  phonetic-alt    am: 
-  eastern         am: 
-  western         am: 
-  eastern-alt     am: 
-  cyrillic        az: 
-  winkeys         by: 
-  latin           by: 
-  iso-alternate   be: 
-  nodeadkeys      be: 
-  sundeadkeys     be: 
-  wang            be: 
-  probhat         bd: 
-  ben             in: 
-  ben_probhat     in: 
-  guj             in: 
-  guru            in: 
-  jhelum          in: 
-  kan             in: 
-  mal             in: 
-  mal_lalitha     in: 
-  ori             in: 
-  tam_unicode     in: 
-  tam_TAB         in: 
-  tam_TSCII       in: 
-  tam             in: 
-  tel             in: 
-  urd             in: 
-  bolnagri        in: 
-  alternatequotes ba: 
-  unicode         ba: 
-  unicodeus       ba: 
-  us              ba: 
-  nodeadkeys      br: 
-  dvorak          br: 
-  nativo          br: 
-  nativo-us       br: 
-  nativo-epo      br: 
-  phonetic        bg: 
-  french          ma: 
-  tifinagh        ma: 
-  tifinagh-alt    ma: 
-  tifinagh-alt-phonetic ma: 
-  tifinagh-extended ma: 
-  tifinagh-phonetic ma: 
-  tifinagh-extended-phonetic ma: 
-  fr-dvorak       ca: 
-  fr-legacy       ca: 
-  multix          ca: 
-  multi           ca: 
-  multi-2gr       ca: 
-  ike             ca: 
-  shs             ca: 
-  kut             ca: 
-  tib             cn: 
-  tib_asciinum    cn: 
-  alternatequotes hr: 
-  unicode         hr: 
-  unicodeus       hr: 
-  us              hr: 
-  bksl            cz: 
-  qwerty          cz: 
-  qwerty_bksl     cz: 
-  ucw             cz: 
-  nodeadkeys      dk: 
-  mac             dk: 
-  mac_nodeadkeys  dk: 
-  dvorak          dk: 
-  sundeadkeys     nl: 
-  mac             nl: 
-  std             nl: 
-  nodeadkeys      ee: 
-  dvorak          ee: 
-  us              ee: 
-  pro             ir: 
-  keypad          ir: 
-  pro_keypad      ir: 
-  ku              ir: 
-  ku_f            ir: 
-  ku_alt          ir: 
-  ku_ara          ir: 
-  ku              iq: 
-  ku_f            iq: 
-  ku_alt          iq: 
-  ku_ara          iq: 
-  nodeadkeys      fo: 
-  nodeadkeys      fi: 
-  smi             fi: 
-  classic         fi: 
-  mac             fi: 
-  nodeadkeys      fr: 
-  sundeadkeys     fr: 
-  oss             fr: 
-  oss_latin9      fr: 
-  oss_nodeadkeys  fr: 
-  oss_sundeadkeys fr: 
-  latin9          fr: 
-  latin9_nodeadkeys fr: 
-  latin9_sundeadkeys fr: 
-  bepo            fr: 
-  bepo_latin9     fr: 
-  dvorak          fr: 
-  mac             fr: 
-  geo             fr: 
-  generic         gh: 
-  akan            gh: 
-  ewe             gh: 
-  fula            gh: 
-  ga              gh: 
-  hausa           gh: 
-  ergonomic       ge: 
-  mess            ge: 
-  ru              ge: 
-  os              ge: 
-  deadacute       de: 
-  deadgraveacute  de: 
-  nodeadkeys      de: 
-  ro              de: 
-  ro_nodeadkeys   de: 
-  dvorak          de: 
-  sundeadkeys     de: 
-  neo             de: 
-  mac             de: 
-  mac_nodeadkeys  de: 
-  simple          gr: 
-  extended        gr: 
-  nodeadkeys      gr: 
-  polytonic       gr: 
-  standard        hu: 
-  nodeadkeys      hu: 
-  qwerty          hu: 
-  101_qwertz_comma_dead hu: 
-  101_qwertz_comma_nodead hu: 
-  101_qwertz_dot_dead hu: 
-  101_qwertz_dot_nodead hu: 
-  101_qwerty_comma_dead hu: 
-  101_qwerty_comma_nodead hu: 
-  101_qwerty_dot_dead hu: 
-  101_qwerty_dot_nodead hu: 
-  102_qwertz_comma_dead hu: 
-  102_qwertz_comma_nodead hu: 
-  102_qwertz_dot_dead hu: 
-  102_qwertz_dot_nodead hu: 
-  102_qwerty_comma_dead hu: 
-  102_qwerty_comma_nodead hu: 
-  102_qwerty_dot_dead hu: 
-  102_qwerty_dot_nodead hu: 
-  Sundeadkeys     is: 
-  nodeadkeys      is: 
-  mac             is: 
-  dvorak          is: 
-  lyx             il: 
-  phonetic        il: 
-  biblical        il: 
-  nodeadkeys      it: 
-  mac             it: 
-  geo             it: 
-  kana            jp: 
-  OADG109A        jp: 
-  ruskaz          kz: 
-  kazrus          kz: 
-  nodeadkeys      latam: 
-  sundeadkeys     latam: 
-  std             lt: 
-  us              lt: 
-  ibm             lt: 
-  lekp            lt: 
-  lekpa           lt: 
-  balticplus      lt: 
-  apostrophe      lv: 
-  tilde           lv: 
-  fkey            lv: 
-  cyrillic        me: 
-  cyrillicyz      me: 
-  latinunicode    me: 
-  latinyz         me: 
-  latinunicodeyz  me: 
-  cyrillicalternatequotes me: 
-  latinalternatequotes me: 
-  nodeadkeys      mk: 
-  us              mt: 
-  nodeadkeys      no: 
-  dvorak          no: 
-  smi             no: 
-  smi_nodeadkeys  no: 
-  mac             no: 
-  mac_nodeadkeys  no: 
-  qwertz          pl: 
-  dvorak          pl: 
-  dvorak_quotes   pl: 
-  dvorak_altquotes pl: 
-  csb             pl: 
-  ru_phonetic_dvorak pl: 
-  nodeadkeys      pt: 
-  sundeadkeys     pt: 
-  mac             pt: 
-  mac_nodeadkeys  pt: 
-  mac_sundeadkeys pt: 
-  nativo          pt: 
-  nativo-us       pt: 
-  nativo-epo      pt: 
-  cedilla         ro: 
-  std             ro: 
-  std_cedilla     ro: 
-  winkeys         ro: 
-  phonetic        ru: 
-  typewriter      ru: 
-  legacy          ru: 
-  tt              ru: 
-  os_legacy       ru: 
-  os_winkeys      ru: 
-  cv              ru: 
-  cv_latin        ru: 
-  udm             ru: 
-  kom             ru: 
-  sah             ru: 
-  yz              rs: 
-  latin           rs: 
-  latinunicode    rs: 
-  latinyz         rs: 
-  latinunicodeyz  rs: 
-  alternatequotes rs: 
-  latinalternatequotes rs: 
-  alternatequotes si: 
-  unicode         si: 
-  unicodeus       si: 
-  us              si: 
-  bksl            sk: 
-  qwerty          sk: 
-  qwerty_bksl     sk: 
-  nodeadkeys      es: 
-  sundeadkeys     es: 
-  dvorak          es: 
-  ast             es: 
-  cat             es: 
-  mac             es: 
-  nodeadkeys      se: 
-  dvorak          se: 
-  rus             se: 
-  rus_nodeadkeys  se: 
-  smi             se: 
-  mac             se: 
-  svdvorak        se: 
-  de_nodeadkeys   ch: 
-  de_sundeadkeys  ch: 
-  fr              ch: 
-  fr_nodeadkeys   ch: 
-  fr_sundeadkeys  ch: 
-  fr_mac          ch: 
-  de_mac          ch: 
-  syc             sy: 
-  syc_phonetic    sy: 
-  ku              sy: 
-  ku_f            sy: 
-  ku_alt          sy: 
-  tam_unicode     lk: 
-  tam_TAB         lk: 
-  tis             th: 
-  pat             th: 
-  f               tr: 
-  alt             tr: 
-  sundeadkeys     tr: 
-  ku              tr: 
-  ku_f            tr: 
-  ku_alt          tr: 
-  intl            tr: 
-  phonetic        ua: 
-  typewriter      ua: 
-  winkeys         ua: 
-  unicode         ua: 
-  rstu            ua: 
-  rstu_ru         ua: 
-  homophonic      ua: 
-  intl            gb: 
-  dvorak          gb: 
-  dvorakukp       gb: 
-  mac             gb: 
-  colemak         gb: 
-  latin           uz: 
-  kr104           kr: 
-  CloGaelach      ie: 
-  UnicodeExpert   ie: 
-  ogam            ie: 
-  ogam_is434      ie: 
-  ara             pk: 
-  legacy          epo: 
-  igbo            ng: 
-  yoruba          ng: 
-  hausa           ng: 
-  left_hand       braille: 
-  right_hand      braille: 
-
-! option
-  grp                  
-  grp:switch           
-  grp:lswitch          
-  grp:lwin_switch      
-  grp:rwin_switch      
-  grp:win_switch       
-  grp:caps_switch      
-  grp:rctrl_switch     
-  grp:toggle           
-  grp:lalt_toggle      
-  grp:caps_toggle      
-  grp:shift_caps_toggle 
-  grp:shift_caps_switch 
-  grp:alt_caps_toggle  
-  grp:shifts_toggle    
-  grp:alts_toggle      
-  grp:ctrls_toggle     
-  grp:ctrl_shift_toggle 
-  grp:lctrl_lshift_toggle 
-  grp:ctrl_alt_toggle  
-  grp:alt_shift_toggle 
-  grp:menu_toggle      
-  grp:lwin_toggle      
-  grp:rwin_toggle      
-  grp:lshift_toggle    
-  grp:rshift_toggle    
-  grp:lctrl_toggle     
-  grp:rctrl_toggle     
-  lv3                  
-  lv3:switch           
-  lv3:menu_switch      
-  lv3:win_switch       
-  lv3:lwin_switch      
-  lv3:rwin_switch      
-  lv3:alt_switch       
-  lv3:lalt_switch      
-  lv3:ralt_switch      
-  lv3:ralt_switch_multikey 
-  lv3:ralt_alt         
-  ctrl                 
-  ctrl:nocaps          
-  ctrl:swapcaps        
-  ctrl:ctrl_ac         
-  ctrl:ctrl_aa         
-  ctrl:ctrl_ra         
-  grp_led              
-  grp_led:num          
-  grp_led:caps         
-  grp_led:scroll       
-  keypad               
-  keypad:legacy        
-  keypad:oss           
-  keypad:future        
-  keypad:legacy_wang   
-  keypad:oss_wang      
-  keypad:future_wang   
-  keypad:phone_hex     
-  kpdl                 
-  kpdl:dot             
-  kpdl:comma           
-  kpdl:dotoss          
-  kpdl:dotoss_latin9   
-  kpdl:commaoss        
-  kpdl:momayyezoss     
-  kpdl:kposs           
-  caps                 
-  caps:internal        
-  caps:internal_nocancel 
-  caps:shift           
-  caps:shift_nocancel  
-  caps:capslock        
-  caps:swapescape      
-  caps:shiftlock       
-  altwin               
-  altwin:menu          
-  altwin:meta_alt      
-  altwin:ctrl_win      
-  altwin:meta_win      
-  altwin:left_meta_win 
-  altwin:super_win     
-  altwin:hyper_win     
-  altwin:alt_super_win 
-  altwin:swap_lalt_lwin 
-  Compose key          
-  compose:ralt         
-  compose:lwin         
-  compose:rwin         
-  compose:menu         
-  compose:rctrl        
-  compose:caps         
-  compose:102          
-  compat               
-  numpad:pc            
-  numpad:mac           
-  numpad:microsoft     
-  srvrkeys:none        
-  apple:badmap         
-  shift:breaks_caps    
-  eurosign             
-  eurosign:e           
-  eurosign:2           
-  eurosign:4           
-  eurosign:5           
-  nbsp                 
-  nbsp:none            
-  nbsp:level2          
-  nbsp:level3          
-  nbsp:level3s         
-  nbsp:level3n         
-  nbsp:level4          
-  nbsp:level4n         
-  nbsp:level4nl        
-  japan                
-  japan:kana_lock      
-  japan:nicola_f_bs