Merge branch 'master' into wordWrappingEndOfScreenBell

2016-11-20 17:17:30 +01:00
parent 7dfdb37d8e 2ee0fe7bb3
commit b9a21a7162
14 changed files with 78 additions and 29 deletions
--- a/src/fenrir/core/settings.py
+++ b/src/fenrir/core/settings.py
@@ -70,6 +70,8 @@ settings = {
  'presentDate': True,  
  'delaySec': 0,
  'onMinutes': '00,30',
+  'announce': True,
+  'interrupt': False,
 },
 'keyboard':{
  'driver': 'evdev',