Merge branch 'develop' into feature/new-splashscreen

This commit is contained in:
Manuel Friedli 2014-10-22 00:35:48 +02:00
commit 337fb6f238
8 changed files with 389 additions and 356 deletions

View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 6.3.3
# 6.4
css/uhr.css
css/uhr-black.css
@ -15,7 +15,6 @@ js/uhr.js
js/uhr-de.js
js/uhr-de_CH.js
js/uhr-de_CH_genau.js
js/uhr-de_CH-seconds.js
js/uhr-en.js
js/uhr-fr.js
js/uhr-it.js