Merge remote-tracking branch 'origin/next' into fifteen

This commit is contained in:
Arne Fitzenreiter
2013-10-06 18:42:53 +02:00
2 changed files with 3 additions and 3 deletions

View File

@@ -446,7 +446,7 @@ sub showEditBox() {
<table width='100%'>
<tr>
<td class='base' width='20%'>$Lang::tr{'wlan client ssid'}:</td>
<td width='40%'><input type='text' name='SSID' value='$settings{'SSID'}' size='25'/></td>
<td width='40%'><input type='text' name='SSID' value="$settings{'SSID'}" size='25'/></td>
<td class='base' width='10%'>$Lang::tr{'enabled'}</td>
<td width='30%'><input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td>
</tr>
@@ -464,7 +464,7 @@ sub showEditBox() {
</tr>
<tr>
<td class='base' width='20%'>$Lang::tr{'wlan client psk'}:&nbsp;</td>
<td width='40%'><input type='password' name='PSK' value='$settings{'PSK'}' size='25'/></td>
<td width='40%'><input type='password' name='PSK' value="$settings{'PSK'}" size='25'/></td>
<td colspan="2" width='40%'></td>
</tr>
</table>

View File

@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.13" # Version number
CORE="73" # Core Level (Filename)
PAKFIRE_CORE="72" # Core Level (PAKFIRE)
PAKFIRE_CORE="73" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir