diff options
| author | sam <sam@FreeBSD.org> | 2008-03-24 19:46:53 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-03-24 19:46:53 +0000 |
| commit | bc895c971f511040199035dae5f9de6d5c12827d (patch) | |
| tree | ad4332d1c7ebc20c3caa7dfe6c37bd44442b8998 /contrib/wpa_supplicant/wpa_gui-qt4 | |
| parent | 86c0a7d5de867437e79253da55689f2d4e3e2f06 (diff) | |
| parent | 153f9c1cd9a5b749f57e28682fadb39c781e1e5d (diff) | |
| download | FreeBSD-src-bc895c971f511040199035dae5f9de6d5c12827d.zip FreeBSD-src-bc895c971f511040199035dae5f9de6d5c12827d.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r177568,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/wpa_supplicant/wpa_gui-qt4')
| -rw-r--r-- | contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp | 2 | ||||
| -rw-r--r-- | contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp b/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp index ca86265..6ea35e0 100644 --- a/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp +++ b/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp @@ -162,7 +162,7 @@ void NetworkConfig::addNetwork() setNetworkParam(id, "ssid", ssidEdit->text().ascii(), true); - char *key_mgmt = NULL, *proto = NULL, *pairwise = NULL; + const char *key_mgmt = NULL, *proto = NULL, *pairwise = NULL; switch (auth) { case AUTH_NONE: key_mgmt = "NONE"; diff --git a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp index 1dc7af2..31cb38c 100644 --- a/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +++ b/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp @@ -1,6 +1,6 @@ /* * wpa_gui - WpaGui class - * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi> + * Copyright (c) 2005-2008, Jouni Malinen <j@w1.fi> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -513,7 +513,7 @@ void WpaGui::helpContents() void WpaGui::helpAbout() { QMessageBox::about(this, "wpa_gui for wpa_supplicant", - "Copyright (c) 2003-2006,\n" + "Copyright (c) 2003-2008,\n" "Jouni Malinen <j@w1.fi>\n" "and contributors.\n" "\n" |
