Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-28 08:10:11 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into darkaudacity

Browse Source 
Conflicts:
	src/TrackPanel.cpp
	src/toolbars/ControlToolBar.cpp
This commit is contained in:
James Crook
2017-04-01 20:32:07 +01:00
parent 0aac05bd58 1525f146da
commit bd364ea0ec
139 changed files with 4586 additions and 4061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -177,6 +177,7 @@ win/Debug
win/Release
win/Projects/*/Debug
win/Projects/*/Release
win/.vs/
# All those help files
help/manual*