Wireshark-commits: [Wireshark-commits] rev 44797: /trunk/ /trunk/doc/: README.qt /trunk/ui/qt/: cap
Date: Thu, 06 Sep 2012 22:58:39 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44797

User: gerald
Date: 2012/09/06 03:58 PM

Log:
 Implement File→Merge. 
 
 The GTK+ and native Win32 versions are slightly different. The GTK+
 version lets you select an output file type and the Win32 version uses
 the existing capture filetype. We do the latter for now.
 
 Start documenting significant UI changes in README.qt. This might be
 better handled on the wiki.

Directory: /trunk/doc/
  Changes    Path          Action
  +11 -2     README.qt     Modified

Directory: /trunk/ui/qt/
  Changes    Path                       Action
  +221 -115  capture_file_dialog.cpp    Modified
  +37 -16    capture_file_dialog.h      Modified
  +220 -21   main_window.cpp            Modified
  +3 -1      main_window.h              Modified