Merge branch 'master' into preos

2014-01-08 16:19:56 +01:00 · 2014-01-08 16:19:56 +01:00 · 28ba493e71
commit 28ba493e71
parent 84eb05aed6 57b700d11b
80 changed files with 1387 additions and 165 deletions
--- a/docs/dev/logs/2011-11-16.workflow-example.dia
+++ b/docs/dev/logs/2011-11-16.workflow-example.dia
--- a/docs/dev/logs/2011-11-16.workflow-example.png
+++ b/docs/dev/logs/2011-11-16.workflow-example.png
--- a/docs/dev/logs/2011-11-17.workflow-example.dia
+++ b/docs/dev/logs/2011-11-17.workflow-example.dia
--- a/docs/dev/logs/2013-08-27-notifications.xoj
+++ b/docs/dev/logs/2013-08-27-notifications.xoj
--- a/docs/dev/logs/2013-12-12.discussion
+++ b/docs/dev/logs/2013-12-12.discussion
@ -0,0 +1,6 @@
+With Steven
+
+- Implement environments
+    - for configuring "anything" including switches
+    - can disable / use other global explorers
+- 98% of our framework is generic and can be used for any applikation