Show
Ignore:
Timestamp:
06/01/08 19:42:57 (7 months ago)
Author:
edmanm
Message:

r413@thebe: edmanm | 2008-06-01 19:31:12 -0400
Merge the UPnP test dialog and related files into trunk.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • vidalia/trunk/src/vidalia/CMakeLists.txt

    r2638 r2639  
    9595    config/upnpcontrol.cpp 
    9696    config/upnpcontrolthread.cpp 
     97    config/upnptestdialog.cpp 
    9798  ) 
    9899  qt4_wrap_cpp(vidalia_SRCS 
    99100    config/upnpcontrol.h 
    100101    config/upnpcontrolthread.h 
     102    config/upnptestdialog.h 
    101103  ) 
    102104endif(USE_MINIUPNPC) 
     
    205207  network/netviewer.ui 
    206208) 
     209if (USE_MINIUPNPC) 
     210  qt4_wrap_ui(vidalia_SRCS config/upnptestdialog.ui) 
     211endif(USE_MINIUPNPC) 
    207212 
    208213## Add the resource files (icons, etc.)