diff options
Diffstat (limited to 'libs/ardour/panner_search_path.cc')
| -rw-r--r-- | libs/ardour/panner_search_path.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/panner_search_path.cc b/libs/ardour/panner_search_path.cc index 100c406edd..2889063ca4 100644 --- a/libs/ardour/panner_search_path.cc +++ b/libs/ardour/panner_search_path.cc @@ -37,8 +37,12 @@ panner_search_path () Searchpath spath(user_config_directory ()); spath += ardour_dll_directory (); spath.add_subdirectory_to_paths(panner_dir_name); +<<<<<<< HEAD + spath += SearchPath(Glib::getenv(panner_env_variable_name)); +======= spath += Searchpath(Glib::getenv(panner_env_variable_name)); +>>>>>>> windows+cc return spath; } |