Merge branch 'master' of https://github.com/lllucius/audacity

Browse Source

Conflicts:
	src/toolbars/ControlToolBar.cpp

...

This commit is contained in:

Leland Lucius 2015-04-17 16:37:17 -05:00

parent 69b044e321 8ab7c271c9

commit 5bd99f94cd

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

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

Diff Content Not Available