[dasher: 47/217] Merge branch 'master' of https://github.com/ipomoena/dasher

[Patrick Welche <pwelche src gnome org>]

commit 04ea1869a20cc8b26752ef727fca751c226e7743
Merge: 2095564 bc15aee
Author: ipomoena <amajorek google com>
Date:   Fri Oct 2 22:29:09 2015 -0700

    Merge branch 'master' of https://github.com/ipomoena/dasher

 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/Common/Common_vc2013.vcxproj         |    4 +-
 Src/DasherCore/DasherCore_vc2013.vcxproj |    4 +-
 Src/Installer/Dasher.wxs                 |  557 +-
 Src/InstallerTobii/InstallerTobii.wxs    |  551 +-
 Src/InstallerW2K/InstallerW2K.wxs        |  551 +-
 Src/Win32/DasherControl_vc2013.vcxproj   |    4 +-
 Src/Win32/Dasher_vc2013.vcxproj          |    4 +-
 Src/update_wix.perl                      |  110 +
 15 files changed, 907 insertions(+), 26427 deletions(-)
---