James Crook da1f860f2f 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

2017-02-13 18:34:13 +00:00

..

Aqua

…

ControlButtons

…

Cursors16

…

Cursors32

…

EditButtons

…

EffectRack

…

ExpandingToolBar

…

icons

…

MixerImages

…

MusicalInstruments

…

ToolBarImages

…

ToolsButtons

…

TranscriptionImages

…

Aqua.xpm

…

Arrow15x15.xpm

…

Arrow.xpm

…

audacity.svg

…

AudacityLogo48x48.xpm

…

AudacityLogo.xpm

…

AudacityLogoAlpha.xpm

…

AudacityLogoWithName.xpm

Add Powered By text and moved copyright and trademark notice up.

2016-09-09 23:16:35 +01:00

Checked.xpm

…

ControlButtons.h

…

Cursors.h

MakeCursor returns smart pointer; TrackPanel stores smart pointers to cursors

2016-04-09 23:07:27 -04:00

EditButtons.h

…

Effect.h

Migrating the remaining effects

2015-04-16 23:36:28 -05:00

Empty9x16.xpm

…

GlyphImages.h

…

gnome-mime-application-x-audacity-project.xpm

…

Makefile.am

…

Makefile.in

Update for Sample Data Import

2016-11-23 17:49:53 +00:00

MicMenu.xpm

Let's try narrower icons...

2014-12-28 23:48:01 +00:00

MixerImages.h

…

MusicalInstruments.h

…

PostfishButtons.h

…

SliderThumb_Vertical.xpm

…

SliderThumb_VerticalAlpha.xpm

…

SliderThumb_VerticalDisabled.xpm

…

SliderThumb.xpm

…

SliderThumbAlpha.xpm

…

SliderThumbDisabled.xpm

…

SpeakerMenu.xpm

Let's try narrower icons...

2014-12-28 23:48:01 +00:00

ToolBarButtons.h

…

ToolsButtons.h

…

TranscriptionButtons.h

…

Unchecked.xpm

…

UploadImages.h

…