[dasher: 4/5] Merge branch 'sent_22Dec09'

[Patrick Welche <pwelche src gnome org>]

commit 49d719c5a22931eb4b4c230e044058ca95f58685
Merge: e7fe8a2 a449ba6
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu Jan 7 14:07:39 2010 +0000

    Merge branch 'sent_22Dec09'

 Src/DasherCore/Alphabet/Alphabet.cpp        |   87 +++++++++++++++++----------
 Src/DasherCore/Alphabet/Alphabet.h          |   15 ++++-
 Src/DasherCore/ExpansionPolicy.cpp          |   10 ++-
 Src/DasherCore/Trainer.cpp                  |    6 +-
 Src/DasherCore/Trainer.h                    |    5 +-
 Src/DasherCore/TrainingHelper.cpp           |   13 ++--
 Src/DasherCore/TrainingHelper.h             |    2 +-
 Src/iPhone/Classes/CalibrationController.mm |    7 ++-
 Src/iPhone/Classes/IPhoneFilters.cpp        |    4 +-
 Src/iPhone/Classes/IPhoneFilters.h          |    2 +-
 Src/iPhone/Dasher.xcodeproj/project.pbxproj |   23 ++-----
 11 files changed, 104 insertions(+), 70 deletions(-)
---