Manuel Friedli 5924f43d99 Merge branch 'master' into feature/new-splashscreen ... Conflicts: manifest.appcache		2014-08-26 17:06:02 +02:00
..
apple-touch-icon-precomposed.png	some JSHint'ing and reorganizing of the project-structure	2014-07-03 16:53:28 +02:00
close.png	converted controls into an overlay	2014-08-10 23:14:29 +02:00
favicon.png	Merge branch 'master' into feature/new-splashscreen	2014-08-26 17:06:02 +02:00
settings.png	converted controls into an overlay	2014-08-10 23:14:29 +02:00
uhr.woff	some JSHint'ing and reorganizing of the project-structure	2014-07-03 16:53:28 +02:00