Merge branch 'master' into wordWrappingEndOfScreenBell

2016-11-09 23:26:41 +01:00
parent 159498d8c7 3171018e6e
commit 680e624429
12 changed files with 119 additions and 4 deletions
--- a/src/fenrir/core/settings.py
+++ b/src/fenrir/core/settings.py
@@ -64,6 +64,12 @@ settings = {
  'inactiveTimeoutSec': 120,
  'list': '',
 },
+'time':{
+  'enabled': False,
+  'presentTime': True,
+  'presentDate': True,  
+  'delaySec': 3600,
+},
 'keyboard':{
  'driver': 'evdev',
  'device': 'all',