[dasher: 30/217] Merge pull request #7 from promixis/master

[Patrick Welche <pwelche src gnome org>]

commit 51a6ef7df0985dbc664249440e80beb9f9a68162
Merge: bee3f2a 57b255f
Author: Ada Majorek <amajorek google com>
Date:   Fri Sep 11 14:41:13 2015 -0700

    Merge pull request #7 from promixis/master
    
    WIX Installer project fixes

 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/DasherCore/DasherCore_vc2013.vcxproj  |    6 +-
 Src/Installer/Dasher.wxs                  |    4 +-
 Src/Installer/Installer.wixproj           |   10 +-
 Src/InstallerTobii/InstallerTobii.wixproj |   10 +-
 Src/InstallerTobii/InstallerTobii.wxs     |    2 +-
 Src/InstallerW2K/InstallerW2K.wixproj     |   10 +-
 Src/InstallerW2K/InstallerW2K.wxs         |    2 +-
 Src/Win32/Dasher.rc                       |    3 +-
 Src/Win32/DasherControl_vc2013.vcxproj    |    4 +
 Src/Win32/DasherWindow.cpp                |   14 +-
 Src/Win32/Dasher_vc2013.sln               |  186 +-
 Src/Win32/Dasher_vc2013.vcxproj           |   12 +-
 Src/Win32/Widgets/Toolbar.cpp             |    2 +-
 Src/Win32/resource.h                      |    8 +-
 21 files changed, 25689 insertions(+), 133 deletions(-)
---