Merge branch 'master' into darkaudacityrelease

Browse Source

Conflicts fixed by hand:
	src/AboutDialog.cpp

...

This commit is contained in:

James Crook

2016-09-11 14:13:59 +01:00

parent dc5b6819ae 8b9fab8ff5

commit 324026df6c

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files