1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-06 14:52:34 +02:00
James Crook f606375202 Merge branch 'master' into darkaudacity
Fixed conflicts by hand in:
	LICENSE.txt
	README.txt
	src/AboutDialog.cpp
	src/Audacity.h
	src/HelpText.cpp
	src/toolbars/ToolDock.cpp
	win/audacity.iss
2017-03-19 15:48:16 +00:00
..
2014-10-26 03:24:10 +00:00
2014-10-26 03:24:10 +00:00
2014-10-26 03:24:10 +00:00
2014-10-26 03:24:10 +00:00
2015-04-16 23:36:28 -05:00
2014-10-26 03:24:10 +00:00
2017-03-18 20:13:39 +00:00
2014-12-28 23:48:01 +00:00
2014-12-28 23:48:01 +00:00
2014-10-26 03:24:10 +00:00