[dasher: 46/217] Merge pull request #20 from promixis/master

[Patrick Welche <pwelche src gnome org>]

commit bc15aee5f0610e5e3173070d68c08b7f16fcd681
Merge: 637b0fa 1db343d
Author: Ada Majorek <amajorek google com>
Date:   Fri Oct 2 10:18:37 2015 -0700

    Merge pull request #20 from promixis/master
    
    Wix installer updates

 Data/alphabets/alphabet.chinese.xml     |10188 ------------------------------
 Data/alphabets/alphabet.chineseRuby.xml |10253 -------------------------------
 Data/alphabets/alphabet.pinyin.xml      |  103 -
 Data/alphabets/alphabet.spyDict.xml     | 4963 ---------------
 Data/controllabels/Makefile.am          |    3 -
 Data/controllabels/controllabels.dtd    |    7 -
 Data/controllabels/controllabels.xml    |   32 -
 Src/Installer/Dasher.wxs                |  557 +-
 Src/InstallerTobii/InstallerTobii.wxs   |  551 +-
 Src/InstallerW2K/InstallerW2K.wxs       |  551 +-
 Src/update_wix.perl                     |  110 +
 11 files changed, 899 insertions(+), 26419 deletions(-)
---