--- gigedit/trunk/src/gigedit/mainwindow.h	2014/01/12 19:37:55	2507
+++ gigedit/trunk/src/gigedit/mainwindow.h	2014/05/13 12:17:43	2548
@@ -281,6 +281,7 @@
     bool instr_props_set_instrument();
     void show_midi_rules();
     void on_action_view_status_bar();
+    void on_action_warn_user_on_extensions();
     void on_action_help_about();
 
     // sample right-click popup actions
@@ -334,6 +335,8 @@
     void instr_name_changed_by_instr_props(Gtk::TreeModel::iterator& it);
     sigc::connection instrument_name_connection;
 
+    void on_action_combine_instruments();
+
     void __import_queued_samples();
     void __clear();