manuel/uhr
1
0
Fork 0
Code Issues 5 Pull requests Releases Wiki Activity

Merge branch 'develop' of git.friedli.info:manuel/uhr into feature/uhr-object

Browse source 
Conflicts:
	uhr-de.js
	uhr-de_CH.js
	uhr-en.js
This commit is contained in:
Manuel Friedli 2013-11-26 13:32:17 +01:00
commit d7d03b5b51
4 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
manifest.appcache
View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# 2.1.2 # 2.1.4
index.html index.html
jquery-2.0.3.min.js jquery-2.0.3.min.js

3
uhr-de.js
View file

@ -10,8 +10,7 @@ var layout = {
[h('D', 3), h('R', 3),h('E', 3),h('I', 3),l('P'),l('M'),l('J'),h('V', 4),h('I', 4),h('E', 4),h('R', 4)], [h('D', 3), h('R', 3),h('E', 3),h('I', 3),l('P'),l('M'),l('J'),h('V', 4),h('I', 4),h('E', 4),h('R', 4)],
[h('S', 6), h('E', 6),h('C', 6),h('H', 6),h('S', 6),l('N'),l('L'),h('A', 8),h('C', 8),h('H', 8),h('T', 8)], [h('S', 6), h('E', 6),h('C', 6),h('H', 6),h('S', 6),l('N'),l('L'),h('A', 8),h('C', 8),h('H', 8),h('T', 8)],
[h('S', 7), h('I', 7),h('E', 7),h('B', 7),h('E', 7),h('N', 7),h('Z', 12),h('W', 12),h('Ö', 12),h('L', 12),h('F', 12)], [h('S', 7), h('I', 7),h('E', 7),h('B', 7),h('E', 7),h('N', 7),h('Z', 12),h('W', 12),h('Ö', 12),h('L', 12),h('F', 12)],
[h('Z', 10), h('E', 10),h('H', 10),h('N', 9, 10),h('E', 9),h('U', 9),h('N', 9),l('K'),l('U', 'sharphour'),l('H', 'sharphour'),l('R', 'sharphour')] [h('Z', 10), h('E', 10),h('H', 10),h('N', 9, 10),h('E', 9),h('U', 9),h('N', 9),l('K'),l('U'),l('H'),l('R')]
] ]
}; };
uhr.register('de', layout); uhr.register('de', layout);

1
uhr-de_CH.js
View file

@ -14,4 +14,3 @@ var layout = {
] ]
}; };
uhr.register('de_CH', layout); uhr.register('de_CH', layout);

1
uhr-en.js
View file

@ -14,4 +14,3 @@ var layout = {
] ]
}; };
uhr.register('en', layout); uhr.register('en', layout);