Revert "Merge branch 'master' into hf_mf_sim"

This reverts commit cbea5d9d02, reversing changes made to b66152feb2.
2019-03-15 21:45:00 +01:00
parent cbea5d9d02
commit cfe2b2797e
161 changed files with 1465 additions and 2004 deletions
--- a/client/scripts/calypso.lua
+++ b/client/scripts/calypso.lua
@@ -273,4 +273,4 @@ if "--test"==args then
 else
    -- Call the main
    main(args)
-end
+end