* [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 1a3dbe91b2456323c1fe53797da673b4d0f87e17
@ 2013-10-06 16:44 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-10-06 16:44 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 2891 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
via 1a3dbe91b2456323c1fe53797da673b4d0f87e17 (commit)
via 1bd3de895bd354ef9ec33930b25fd9679814e72d (commit)
via cd6c59aac1c89f75995cae71336309c24003871b (commit)
from 2e053370ab64a3f516fc7f9e4897c5b48eae580d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1a3dbe91b2456323c1fe53797da673b4d0f87e17
Merge: 2e05337 1bd3de8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Oct 6 18:42:53 2013 +0200
Merge remote-tracking branch 'origin/next' into fifteen
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/wirelessclient.cgi | 4 ++--
make.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index c6e20a0..3c52803 100644
--- a/html/cgi-bin/wirelessclient.cgi
+++ b/html/cgi-bin/wirelessclient.cgi
@@ -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'}: </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>
diff --git a/make.sh b/make.sh
index 9bae8a6..9619ad3 100755
--- a/make.sh
+++ b/make.sh
@@ -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
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-10-06 16:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-06 16:44 [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 1a3dbe91b2456323c1fe53797da673b4d0f87e17 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox