projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix merge conflicts from master
[ardour.git]
/
gtk2_ardour
/
ardour_ui.h
diff --git
a/gtk2_ardour/ardour_ui.h
b/gtk2_ardour/ardour_ui.h
index 6365e28ea282e767ba7b1c199695cf1ce063cb80..15413b5ac9da6bdd8f2bda0e793dd2e29ffda72b 100644
(file)
--- a/
gtk2_ardour/ardour_ui.h
+++ b/
gtk2_ardour/ardour_ui.h
@@
-723,7
+723,7
@@
class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void fontconfig_dialog ();
int missing_file (ARDOUR::Session*s, std::string str, ARDOUR::DataType type);
void fontconfig_dialog ();
int missing_file (ARDOUR::Session*s, std::string str, ARDOUR::DataType type);
- int ambiguous_file (std::string file, std::
string path, std::
vector<std::string> hits);
+ int ambiguous_file (std::string file, std::vector<std::string> hits);
bool click_button_clicked (GdkEventButton *);
bool click_button_clicked (GdkEventButton *);