cvs commit: src/contrib/wpa_supplicant common.h config_winreg.c ctrl_iface_named_pipe.c driver_hostap.h eloop_win.c events.c main.c wpa_supplicant.c

[Sam Leffler]

sam         2008-03-24 19:57:52 UTC

  FreeBSD src repository

  Modified files:
    contrib/wpa_supplicant common.h events.c main.c 
                           wpa_supplicant.c 
  Removed files:
    contrib/wpa_supplicant config_winreg.c ctrl_iface_named_pipe.c 
                           driver_hostap.h eloop_win.c 
  Log:
  resolve merge conflicts
  
  MFC after:      3 weeks
  
  Revision  Changes    Path
  1.5       +2 -2      src/contrib/wpa_supplicant/common.h
  1.2       +0 -882    src/contrib/wpa_supplicant/config_winreg.c (dead)
  1.2       +0 -834    src/contrib/wpa_supplicant/ctrl_iface_named_pipe.c (dead)
  1.2       +0 -153    src/contrib/wpa_supplicant/driver_hostap.h (dead)
  1.2       +0 -604    src/contrib/wpa_supplicant/eloop_win.c (dead)
  1.4       +7 -6      src/contrib/wpa_supplicant/events.c
  1.3       +14 -3     src/contrib/wpa_supplicant/main.c
  1.5       +15 -10    src/contrib/wpa_supplicant/wpa_supplicant.c