smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

merge with master and fix 4 conflicts by hand

Browse source
This commit is contained in:
Paul Davis 2014-06-02 11:32:13 -04:00
commit 8c9749e42f
19 changed files with 137 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardev_common.sh.in
View file

@ -18,6 +18,7 @@ export ARDOUR_MIDIMAPS_PATH=$TOP/midi_maps:.
export ARDOUR_MCP_PATH=$TOP/mcp:.
export ARDOUR_EXPORT_FORMATS_PATH=$TOP/export:.
export ARDOUR_BACKEND_PATH=$libs/backends/jack:$libs/backends/wavesaudio:$libs/backends/dummy
export ARDOUR_TEST_PATH=$libs/ardour/test/data
#
# even though we set the above variables, ardour requires that these