cvs commit: src/contrib/wpa_supplicant common.h driver_ndis_.c events.c wpa_ctrl.c wpa_supplicant.c src/contrib/wpa_supplicant/wpa_gui-qt4 eventhistory.ui.h networkconfig.ui.h scanresults.ui.h userdatarequest.ui.h wpagui.ui.h

[Sam Leffler]

sam         2007-07-11 15:58:52 UTC

  FreeBSD src repository

  Modified files:
    contrib/wpa_supplicant common.h events.c wpa_ctrl.c 
                           wpa_supplicant.c 
  Removed files:
    contrib/wpa_supplicant driver_ndis_.c 
    contrib/wpa_supplicant/wpa_gui-qt4 eventhistory.ui.h 
                                       networkconfig.ui.h 
                                       scanresults.ui.h 
                                       userdatarequest.ui.h 
                                       wpagui.ui.h 
  Log:
  resolve merge conflicts
  
  Reviewed by:    thompsa, sephe
  Approved by:    re (hrs)
  
  Revision  Changes    Path
  1.4       +257 -55   src/contrib/wpa_supplicant/common.h
  1.2       +0 -164    src/contrib/wpa_supplicant/driver_ndis_.c (dead)
  1.3       +191 -66   src/contrib/wpa_supplicant/events.c
  1.5       +241 -54   src/contrib/wpa_supplicant/wpa_ctrl.c
  1.2       +0 -41     src/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h (dead)
  1.2       +0 -513    src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h (dead)
  1.2       +0 -101    src/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h (dead)
  1.2       +0 -70     src/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h (dead)
  1.2       +0 -651    src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h (dead)
  1.4       +683 -256  src/contrib/wpa_supplicant/wpa_supplicant.c