Go to file
Manuel Friedli d7d03b5b51 Merge branch 'develop' of git.friedli.info:manuel/uhr into feature/uhr-object
Conflicts:
	uhr-de.js
	uhr-de_CH.js
	uhr-en.js
2013-11-26 13:32:17 +01:00
.gitignore erster entwurf einer sprachabhängigen inhaltsdefinition 2013-11-24 19:31:14 +01:00
.htaccess added files for v1.5.1 2013-11-19 16:55:01 +01:00
index-test.html verschiedene bugfixes und auf index.html umgestellt 2013-11-26 12:48:15 +01:00
index.html auf objekt umgestellt und aufgeräumt 2013-11-26 13:25:50 +01:00
jquery-2.0.3.min.js added files for v1.5.1 2013-11-19 16:55:01 +01:00
jquery.cookie.js jquery.cookie.js hinzugefügt 2013-11-25 14:20:58 +01:00
manifest.appcache manifest aktualisiert 2013-11-26 13:14:43 +01:00
uhr-black.css added files for v1.5.1 2013-11-19 16:55:01 +01:00
uhr-blue.css added files for v1.5.1 2013-11-19 16:55:01 +01:00
uhr-de.js Merge branch 'develop' of git.friedli.info:manuel/uhr into feature/uhr-object 2013-11-26 13:32:17 +01:00
uhr-de_CH.js Merge branch 'develop' of git.friedli.info:manuel/uhr into feature/uhr-object 2013-11-26 13:32:17 +01:00
uhr-en.js Merge branch 'develop' of git.friedli.info:manuel/uhr into feature/uhr-object 2013-11-26 13:32:17 +01:00
uhr-green.css added files for v1.5.1 2013-11-19 16:55:01 +01:00
uhr-idle-dark.css added files for v1.5.1 2013-11-19 16:55:01 +01:00
uhr-idle-light.css added files for v1.5.1 2013-11-19 16:55:01 +01:00
uhr-red.css added files for v1.5.1 2013-11-19 16:55:01 +01:00
uhr-white.css added files for v1.5.1 2013-11-19 16:55:01 +01:00
uhr.css wechsel des layouts ist nun möglich 2013-11-25 13:25:02 +01:00
uhr.js auf objekt umgestellt und aufgeräumt 2013-11-26 13:25:50 +01:00
uhr.woff added files for v1.5.1 2013-11-19 16:55:01 +01:00