Merge branch 'develop' into feature/no-external-links

This commit is contained in:
Manuel Friedli 2014-09-02 18:41:03 +02:00
commit 28670a66bb
9 changed files with 16 additions and 16 deletions

View file

@ -1 +1 @@
6.3.1 6.3.2

View file

@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
(function() { (function($) {
'use strict'; 'use strict';
var es_ist = {1: [1, 2, 4, 5, 6]}; var es_ist = {1: [1, 2, 4, 5, 6]};
var uhr = {10: [9, 10, 11]}; var uhr = {10: [9, 10, 11]};
@ -71,4 +71,4 @@
} }
}; };
$.fritteli.uhr.register('de', layout); $.fritteli.uhr.register('de', layout);
}()); }(jQuery));

View file

@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
(function() { (function($) {
'use strict'; 'use strict';
var vorne0 = { var vorne0 = {
3: [2, 3, 4], 3: [2, 3, 4],
@ -244,4 +244,4 @@
} }
}; };
$.fritteli.uhr.register('de_CH_seconds', layout); $.fritteli.uhr.register('de_CH_seconds', layout);
}()); }(jQuery));

View file

@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
(function() { (function($) {
'use strict'; 'use strict';
// hilfsvariablen // hilfsvariablen
var es_isch = {1: [1, 2, 4, 5, 6, 7]}; var es_isch = {1: [1, 2, 4, 5, 6, 7]};
@ -94,4 +94,4 @@
}; };
// Das Layout bei der Uhr unter dem Code "de_CH" registrieren. // Das Layout bei der Uhr unter dem Code "de_CH" registrieren.
$.fritteli.uhr.register('de_CH', layout); $.fritteli.uhr.register('de_CH', layout);
}()); }(jQuery));

View file

@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
(function() { (function($) {
'use strict'; 'use strict';
var es_isch = {1: [1, 2, 4, 5, 6, 7]}; var es_isch = {1: [1, 2, 4, 5, 6, 7]};
var genau = {3: [7, 8, 9, 10, 11]}; var genau = {3: [7, 8, 9, 10, 11]};
@ -69,4 +69,4 @@
} }
}; };
$.fritteli.uhr.register('de_CH_genau', layout); $.fritteli.uhr.register('de_CH_genau', layout);
}()); }(jQuery));

View file

@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
(function() { (function($) {
'use strict'; 'use strict';
var it_is = {1: [1, 2, 4, 5]}; var it_is = {1: [1, 2, 4, 5]};
var half = {4: [1, 2, 3, 4]}; var half = {4: [1, 2, 3, 4]};
@ -78,4 +78,4 @@
} }
}; };
$.fritteli.uhr.register('en', layout); $.fritteli.uhr.register('en', layout);
}()); }(jQuery));

View file

@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
(function() { (function($) {
'use strict'; 'use strict';
var il_est = {1: [1, 2, 4, 5, 6]}; var il_est = {1: [1, 2, 4, 5, 6]};
var et = {8: [1, 2]}; var et = {8: [1, 2]};
@ -112,4 +112,4 @@
} }
}; };
$.fritteli.uhr.register('fr', layout); $.fritteli.uhr.register('fr', layout);
}()); }(jQuery));

View file

@ -12,7 +12,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
(function() { (function($) {
'use strict'; 'use strict';
var sono_le = {1: [1, 2, 3, 4, 6, 7]}; var sono_le = {1: [1, 2, 3, 4, 6, 7]};
var e_l = {2: [1, 3, 4]}; var e_l = {2: [1, 3, 4]};
@ -77,4 +77,4 @@
} }
}; };
$.fritteli.uhr.register('it', layout); $.fritteli.uhr.register('it', layout);
}()); }(jQuery));

View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# 6.3.1 # 6.3.2
css/uhr.css css/uhr.css
css/uhr-black.css css/uhr-black.css