Changeset 2731
- Timestamp:
- 15.11.2008 19:36:06 (7 weeks ago)
- Location:
- trunk
- Files:
-
- 6 modified
-
Config.in (modified) (4 diffs)
-
FIRMWARES (modified) (2 diffs)
-
patches/7170_labor_all/140-rc.S-no_avm_exit.patch (modified) (1 diff)
-
patches/7170_labor_all/de/130-foncalls.patch (modified) (1 diff)
-
patches/7170_labor_all/de/190-webmenu.patch (modified) (2 diffs)
-
patches/cond/de/webmenu-wol-7170_labor_all.patch (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.in
r2724 r2731 188 188 ) 189 189 190 config FREETZ_TYPE_LABOR_GAMING191 bool "GAMING"192 depends on ( \193 FREETZ_TYPE_FON_WLAN_7170 || \194 FREETZ_TYPE_FON_WLAN_7270 \195 )190 # config FREETZ_TYPE_LABOR_GAMING 191 # bool "GAMING" 192 # depends on ( \ 193 # FREETZ_TYPE_FON_WLAN_7170 || \ 194 # FREETZ_TYPE_FON_WLAN_7270 \ 195 # ) 196 196 197 197 config FREETZ_TYPE_LABOR_MINI … … 202 202 FREETZ_TYPE_FON_WLAN_7270 203 203 204 config FREETZ_TYPE_LABOR_PHONE205 bool "PHONE"206 depends on \207 FREETZ_TYPE_FON_WLAN_7270208 209 config FREETZ_TYPE_LABOR_WLAN210 bool "Labor WLAN / 11n"211 depends on \212 FREETZ_TYPE_FON_WLAN_7270204 # config FREETZ_TYPE_LABOR_PHONE 205 # bool "PHONE" 206 # depends on \ 207 # FREETZ_TYPE_FON_WLAN_7270 208 209 # config FREETZ_TYPE_LABOR_WLAN 210 # bool "Labor WLAN / 11n" 211 # depends on \ 212 # FREETZ_TYPE_FON_WLAN_7270 213 213 214 214 endchoice … … 1464 1464 default "FRITZ.Box_Fon_WLAN_7170.AnnexB.en.29.04.57.image" if FREETZ_TYPE_FON_WLAN_7170 && FREETZ_TYPE_LANG_EN && FREETZ_TYPE_ANNEX_B 1465 1465 default "fritz_box_7170-beta-10954.image" if FREETZ_TYPE_FON_WLAN_7170 && FREETZ_TYPE_LABOR_BETA 1466 default "FRITZ.Box_Fon_WLAN_7170.Labor.29.04.63-12 661.image" if FREETZ_TYPE_FON_WLAN_7170 && FREETZ_TYPE_LABOR_ALL1466 default "FRITZ.Box_Fon_WLAN_7170.Labor.29.04.63-12946.image" if FREETZ_TYPE_FON_WLAN_7170 && FREETZ_TYPE_LABOR_ALL 1467 1467 default "fritz_box-labor-12526.image" if FREETZ_TYPE_FON_WLAN_7170 && FREETZ_TYPE_LABOR_DSL 1468 1468 default "Labor_FRITZ.Box_Fon_WLAN_7170_LabGAMING.AnnexB.29.04.93-11435.image" if FREETZ_TYPE_FON_WLAN_7170 && FREETZ_TYPE_LABOR_GAMING … … 1472 1472 default "FRITZ.Box_Fon_WLAN_7270.54.04.59.image" if FREETZ_TYPE_FON_WLAN_7270 && ! FREETZ_TYPE_LABOR 1473 1473 default "FRITZ_Box_Fon_WLAN_7270-beta-10576.image" if FREETZ_TYPE_FON_WLAN_7270 && FREETZ_TYPE_LABOR_BETA 1474 default "FRITZ.Box_Fon_WLAN_7270.Labor.54.04.63-129 04.image" if FREETZ_TYPE_FON_WLAN_7270 && FREETZ_TYPE_LABOR_ALL1474 default "FRITZ.Box_Fon_WLAN_7270.Labor.54.04.63-12946.image" if FREETZ_TYPE_FON_WLAN_7270 && FREETZ_TYPE_LABOR_ALL 1475 1475 default "fritz_box_54_04_59-11779M.image" if FREETZ_TYPE_FON_WLAN_7270 && FREETZ_TYPE_LABOR_MINI 1476 1476 default "FRITZ.Box_Fon_WLAN_7270_LabPHONE.AnnexB.54.04.97-11197.image" if FREETZ_TYPE_FON_WLAN_7270 && FREETZ_TYPE_LABOR_PHONE -
trunk/FIRMWARES
r2724 r2731 28 28 * Fritz!Box Fon WLAN 7170 (English, Annex B): 29.04.57 29 29 * Fritz!Box Fon WLAN 7170 (A-CH, Annex A): 58.04.59 30 * Labor All In One: 29.04.63-12 66130 * Labor All In One: 29.04.63-12946 31 31 * Labor DSL: 29.04.99-12526 32 32 * Labor Gaming: 29.04.93-11435 … … 35 35 * Fritz!Box Fon WLAN 7240: 73.04.65 36 36 * Fritz!Box Fon WLAN 7270: 54.04.59 37 * Labor All In One: 54.04.63-129 0437 * Labor All In One: 54.04.63-12946 38 38 * Labor DSL: 54.04.99-12606 39 39 * Labor Gaming: 54.04.93-11632 -
trunk/patches/7170_labor_all/140-rc.S-no_avm_exit.patch
r2680 r2731 1 --- etc/init.d/rc.S.orig 2008-1 0-25 19:32:45.000000000 +02002 +++ etc/init.d/rc.S 2008-1 0-25 19:32:45.000000000 +02003 @@ -143 7,4 +1437,3 @@1 --- etc/init.d/rc.S.orig 2008-11-15 19:13:33.000000000 +0100 2 +++ etc/init.d/rc.S 2008-11-15 19:13:34.000000000 +0100 3 @@ -1439,4 +1439,3 @@ 4 4 echo AVMDBG_EOF 1 >/dev/debug 5 5 fi; -
trunk/patches/7170_labor_all/de/130-foncalls.patch
r2641 r2731 1 --- usr/www/all/html/de/home/foncalls.js.orig 2008-1 0-06 15:06:52.000000000 +02002 +++ usr/www/all/html/de/home/foncalls.js 2008-1 0-09 16:07:14.000000000 +02003 @@ -2 87,17 +287,17 @@1 --- usr/www/all/html/de/home/foncalls.js.orig 2008-11-12 17:01:17.000000000 +0100 2 +++ usr/www/all/html/de/home/foncalls.js 2008-11-15 19:13:34.000000000 +0100 3 @@ -220,17 +220,17 @@ 4 4 var buchname = GetBuchName(name); 5 5 var buchnrtype = GetBuchNumberType(telbooknumbertyp); -
trunk/patches/7170_labor_all/de/190-webmenu.patch
r2680 r2731 1 --- usr/www/all/html/de/menus/menu2_homehome.html.orig 2008-1 0-21 16:51:56.000000000 +02002 +++ usr/www/all/html/de/menus/menu2_homehome.html 2008-1 0-25 19:32:46.000000000 +02003 @@ -5 7,5 +57,6 @@1 --- usr/www/all/html/de/menus/menu2_homehome.html.orig 2008-11-12 17:00:51.000000000 +0100 2 +++ usr/www/all/html/de/menus/menu2_homehome.html 2008-11-15 19:13:34.000000000 +0100 3 @@ -56,5 +56,6 @@ 4 4 <? if eq $var:pagename energy `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> 5 5 <? if eq $var:pagename ecosettings `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> … … 8 8 <li class="LMenubottom"> </li> 9 9 </ul> 10 --- usr/www/all/html/de/menus/menu2_konfig.html.orig 2008-1 0-21 16:51:59.000000000 +020011 +++ usr/www/all/html/de/menus/menu2_konfig.html 2008-1 0-25 19:32:46.000000000 +020010 --- usr/www/all/html/de/menus/menu2_konfig.html.orig 2008-11-12 17:00:41.000000000 +0100 11 +++ usr/www/all/html/de/menus/menu2_konfig.html 2008-11-15 19:13:34.000000000 +0100 12 12 @@ -66,5 +66,6 @@ 13 13 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">Programme</a><span class="PTextOnly">Programme</span></li> -
trunk/patches/cond/de/webmenu-wol-7170_labor_all.patch
r2614 r2731 1 --- usr/www/all/html/de/menus/menu2_homehome.html.orig 2008-10- 02 14:54:14.000000000 +02002 +++ usr/www/all/html/de/menus/menu2_homehome.html 2008-10- 02 14:54:14.000000000 +02001 --- usr/www/all/html/de/menus/menu2_homehome.html.orig 2008-10-13 01:23:33.000000000 +0200 2 +++ usr/www/all/html/de/menus/menu2_homehome.html 2008-10-13 01:23:34.000000000 +0200 3 3 @@ -56,6 +56,7 @@ 4 4 <? if eq $var:pagename energy `<? setvariable var:classname 'LStatusMenuitemaktivTop' ?>` ?> … … 10 10 <li class="LMenubottom"> </li> 11 11 </ul> 12 --- usr/www/all/html/de/menus/menu2_konfig.html.orig 2008-10- 02 14:54:14.000000000 +020013 +++ usr/www/all/html/de/menus/menu2_konfig.html 2008-10- 02 14:54:14.000000000 +020012 --- usr/www/all/html/de/menus/menu2_konfig.html.orig 2008-10-13 01:23:33.000000000 +0200 13 +++ usr/www/all/html/de/menus/menu2_konfig.html 2008-10-13 01:23:34.000000000 +0200 14 14 @@ -66,6 +66,7 @@ 15 15 <li class="LMenuitemaktivTop"><img class="LMenuPfeil" src="../html/de/images/leer.gif" style="width:7px;"><a href="javascript:jslGoTo('software','extern')">Programme</a><span class="PTextOnly">Programme</span></li>
