aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-07-06 21:51:33 -0400
committerNils Adermann <naderman@naderman.de>2011-07-06 21:51:33 -0400
commitcf4e6d8a3eecce8b771005af8c9be92a08758f5f (patch)
treeafa7cc8a6a7fb8fa67b3edf4af81226958e2d529 /phpBB/includes/functions.php
parent5eeb870442e01b3949489107ca80c584b36ff4ac (diff)
parent02bba2384403d9ae0f8609786e263c511d495d82 (diff)
downloadforums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar
forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar.gz
forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar.bz2
forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.tar.xz
forums-cf4e6d8a3eecce8b771005af8c9be92a08758f5f.zip
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9: [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d05cccc440..b1c1c14d0c 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3851,7 +3851,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
echo ' </div>';
echo ' </div>';
echo ' <div id="page-footer">';
- echo ' Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group';
+ echo ' Powered by <a href="http://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Group';
echo ' </div>';
echo '</div>';
echo '</body>';
1b83309489e34b51a012e94feb9003a2164.tar'>drakx-b051f1b83309489e34b51a012e94feb9003a2164.tar
drakx-b051f1b83309489e34b51a012e94feb9003a2164.tar.gz
drakx-b051f1b83309489e34b51a012e94feb9003a2164.tar.bz2
drakx-b051f1b83309489e34b51a012e94feb9003a2164.tar.xz
drakx-b051f1b83309489e34b51a012e94feb9003a2164.zip
add support for drivers new in 2.6.29-rc7:
- dvb: firedtv - gigabit: atl1c
Diffstat (limited to 'kernel/list_modules.pm')
-rw-r--r--kernel/list_modules.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index f3ccb6c32..c1c97d5e1 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -41,7 +41,7 @@ our %l = (
],
firewire => [ qw(eth1394 pcilynx) ],
gigabit => [
- qw(atl1 atl1e bnx2 bnx2x cxgb cxgb3 dl2k e1000 e1000e et131x igb ipg ixgb ixgbe myri_sbus netxen_nic ns83820 qla3xxx r8169 s2io sfc sxg sis190 sk98lin skge sky2 spidernet tehuti tg3 via-velocity yellowfin),
+ qw(atl1 atl1c atl1e bnx2 bnx2x cxgb cxgb3 dl2k e1000 e1000e et131x igb ipg ixgb ixgbe myri_sbus netxen_nic ns83820 qla3xxx r8169 s2io sfc sxg sis190 sk98lin skge sky2 spidernet tehuti tg3 via-velocity yellowfin),
qw(bcm5820 bcm5700), #- encrypted
],
@@ -208,7 +208,7 @@ our %l = (
qw(dvb-dibusb dvb-ttpci dvb-ttusb-budget dvb-usb-a800 dvb-usb-cxusb),
qw(dvb-usb-dib0700 dvb-usb-dibusb-mb dvb-usb-dibusb-mc dvb-usb-digitv dvb-usb-dtt200u),
qw(dvb-usb-gp8ps dvb-usb-nova-t-usb2 dvb-usb-ttusb2 dvb-usb-umt-010 dvb-usb-vp702x dvb-usb-vp7045),
- qw(hexium_gemini hexium_orion pluto2 skystar2 ttusb_dec),
+ qw(firedtv hexium_gemini hexium_orion pluto2 skystar2 ttusb_dec),
],
photo => [ qw(dc2xx mdc800) ],
radio => [ qw(radio-gemtek-pci radio-maestro radio-maxiradio) ],