Merge branch 'develop' into feature/new-splashscreen

2014-06-28 16:59:40 +02:00 · 2014-06-28 16:59:40 +02:00 · 8e7029759a
commit 8e7029759a
parent 38ba4bd14b 56f20907d9
9 changed files with 540 additions and 151 deletions
--- a/manifest.appcache
+++ b/manifest.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 5.1
+# 6.0

 COPYING
 README.md
@ -16,13 +16,16 @@ uhr-black.css
 uhr-blue.css
 uhr-de.js
 uhr-de_CH.js
+uhr-de_CH_genau.js
 uhr-en.js
 uhr-green.css
 uhr-pink.css
 uhr-red.css
 uhr-white.css
+uhr-yellow.css
 uhr.css
 uhr.js
 uhr.woff
 info/index.html
 info/info.css
+showcase/index.html