/[svn]/gigedit/trunk/src/gigedit/mainwindow.h
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/mainwindow.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2548 by schoenebeck, Tue May 13 12:17:43 2014 UTC revision 2553 by schoenebeck, Wed May 14 19:57:56 2014 UTC
# Line 336  protected: Line 336  protected:
336      sigc::connection instrument_name_connection;      sigc::connection instrument_name_connection;
337    
338      void on_action_combine_instruments();      void on_action_combine_instruments();
339        void on_action_merge_files();
340        void mergeFiles(const std::vector<std::string>& filenames);
341    
342      void __import_queued_samples();      void __import_queued_samples();
343      void __clear();      void __clear();
344        void __refreshEntireGUI();
345    
346      bool close_confirmation_dialog();      bool close_confirmation_dialog();
347      bool leaving_shared_mode_dialog();      bool leaving_shared_mode_dialog();

Legend:
Removed from v.2548  
changed lines
  Added in v.2553

  ViewVC Help
Powered by ViewVC