Merge branch 'master' of https://github.com/GrammaticalFramework/GF

Conflicts:
	examples/phrasebook/SentencesBul.gf
	examples/phrasebook/WordsBul.gf

1 files changed, 0 insertions, 26 deletions

diff --git a/examples/phrasebook/GreetingsEst.gf b/examples/phrasebook/GreetingsEst.gf
deleted file mode 100644
index fc29f2c3f..000000000
--- a/examples/phrasebook/GreetingsEst.gf
+++ /dev/null
@@ -1,26 +0,0 @@
-concrete GreetingsEst of Greetings = SentencesEst [Greeting,mkGreeting] ** open Prelude in {
-
-lin
-  GBye = mkGreeting "head aega" ;
-  GCheers = mkGreeting "terviseks" ;
-  GDamn = mkGreeting "neetud" ;
-  GExcuse, GExcusePol = mkGreeting "vabandust" ;
-  GGoodDay = mkGreeting "tere päevast" ;
-  GGoodEvening = mkGreeting "tere õhtust" ;
-  GGoodMorning = mkGreeting "tere hommikust" ;
-  GGoodNight = mkGreeting "head ööd" ;
-  GGoodbye = mkGreeting "head aega" ;
-  GHello = mkGreeting "tere" ;
-  GHelp = mkGreeting "appi" ;
-  GHowAreYou = mkGreeting "kuidas käsi käib" ;
-  GLookOut = mkGreeting "ettevaatust" ;
-  GNiceToMeetYou = mkGreeting "meeldiv tutvuda" ;
-  GPleaseGive, GPleaseGivePol = mkGreeting "palun" ;
-  GSeeYouSoon = mkGreeting "kohtumiseni" ;
-  GSorry, GSorryPol = mkGreeting "vabandust" ;
-  GThanks = mkGreeting "suur tänu" ;
-  GTheCheck = mkGreeting "arve" ;
-  GCongratulations = mkGreeting "palju õnne";
-  GHappyBirthday = mkGreeting "palju õnne sünnipäevaks" ;
-  GGoodLuck = mkGreeting "palju edu" ;
-}