jds SVN: nwam-manager

[Lin.Ma at Sun.COM]

Author: lin
Repository: /svn/jds/nwam-manager
Latest revision: 34
Total changesets: 1
Branch: trunk
Date: 2007-11-15 06:15:37 +0000 (Thu, 15 Nov 2007)

Modified files:
	trunk/ChangeLog
	trunk/capplet/nwam_conn_conf_ip_panel.c
	trunk/capplet/nwam_conn_stat_panel.c
	trunk/capplet/nwam_net_conf_panel.c
	trunk/capplet/nwam_pref_dialog.c
	trunk/capplet/nwam_pref_iface.c
	trunk/capplet/nwam_pref_iface.h
	trunk/capplet/nwam_vpn_pref_dialog.c
	trunk/capplet/nwam_wireless_dialog.c
	trunk/common/nwam_ui_icons.h
	trunk/common/nwamui_daemon.c
	trunk/common/nwamui_ncp.c
	trunk/common/nwamui_ncu.c
	trunk/common/nwamui_ncu.h
	trunk/daemon/main.c
	trunk/daemon/notify.c
	trunk/daemon/notify.h
	trunk/daemon/nwam-action.c
	trunk/daemon/nwam-action.h
	trunk/daemon/nwam-menu.c
	trunk/daemon/nwam-menuitem.c
	trunk/daemon/nwam-menuitem.h
	trunk/daemon/nwam-ui.xml

Log message:
Merged branch/lin-task -r18:31
-------------- next part --------------
U   trunk/ChangeLog
U   trunk/capplet/nwam_conn_conf_ip_panel.c
U   trunk/capplet/nwam_conn_stat_panel.c
U   trunk/capplet/nwam_net_conf_panel.c
U   trunk/capplet/nwam_pref_dialog.c
U   trunk/capplet/nwam_pref_iface.c
U   trunk/capplet/nwam_pref_iface.h
U   trunk/capplet/nwam_vpn_pref_dialog.c
U   trunk/capplet/nwam_wireless_dialog.c
U   trunk/common/nwam_ui_icons.h
U   trunk/common/nwamui_daemon.c
U   trunk/common/nwamui_ncp.c
U   trunk/common/nwamui_ncu.c
U   trunk/common/nwamui_ncu.h
U   trunk/daemon/main.c
U   trunk/daemon/notify.c
U   trunk/daemon/notify.h
U   trunk/daemon/nwam-action.c
U   trunk/daemon/nwam-action.h
U   trunk/daemon/nwam-menu.c
U   trunk/daemon/nwam-menuitem.c
U   trunk/daemon/nwam-menuitem.h
U   trunk/daemon/nwam-ui.xml