1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-28 08:10:11 +01:00

Merge branch 'master' into darkaudacity

Conflicts resolved by hand:
	README.txt
	src/AboutDialog.cpp
	src/AudacityApp.cpp
	src/Menus.cpp
	src/TrackPanel.cpp
	win/audacity.rc
This commit is contained in:
James Crook
2017-02-13 18:34:13 +00:00
142 changed files with 240649 additions and 181012 deletions

View File

@@ -27,7 +27,7 @@ BEGIN
VALUE "FileDescription", "A customised Audacity<74> Cross-Platform Sound Editor"
VALUE "FileVersion", AUDACITY_FILE_VERSION
VALUE "InternalName", "DarkAudacity"
VALUE "LegalCopyright", "Copyright <20> 2016. All rights reserved."
VALUE "LegalCopyright", "Copyright <20> 2017. All rights reserved."
VALUE "LegalTrademarks", "Audacity<74> is a registered trademark of Dominic Mazzoni."
VALUE "OriginalFilename", "DarkAudacity.exe"
VALUE "ProductName", "DarkAudacity"