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

..

LADSPA_plugins-win

Fix doubled 'http://'

2016-09-21 10:04:33 +01:00

Projects

Add sample-data-import

2016-11-24 06:22:58 +00:00

wxWidgets_additions

Revised workaround for bug #1266

2015-12-21 16:59:46 -06:00

audacity_InnoWizard_InfoBefore.rtf

Innosetup - Fewer files, updated README and InfoBefore.

2016-08-23 16:06:54 +01:00

audacity_InnoWizardImage.bmp

Updated images and icons

2016-08-23 14:45:28 +01:00

audacity_InnoWizardSmallImage.bmp

Image/Icon changes for Logo.

2016-08-25 15:17:54 +01:00

audacity.ico

Image/Icon changes for Logo.

2016-08-25 15:17:54 +01:00

audacity.iss

Merge branch 'master' into darkaudacity

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

audacity.rc

Merge branch 'master' into darkaudacity

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

audacity.sln

Introduce end-of-line normalization

2016-05-17 01:05:05 +02:00

compile.txt

Update Team list and year

2017-01-17 03:25:15 +00:00

configwin.h

Round 8 of wx3 changes

2015-07-16 14:30:04 -05:00

FirstTimeModel.ini

Set the permissions of the FirstTime.ini file so that it can be deleted

2015-06-19 13:45:52 -05:00

ny.props

Introduce end-of-line normalization

2016-05-17 01:05:05 +02:00

ny.rules

…

ny.targets

Introduce end-of-line normalization

2016-05-17 01:05:05 +02:00

ny.xml

Introduce end-of-line normalization

2016-05-17 01:05:05 +02:00

po.rules

…

release.txt

…

resetPrefsRenamed.txt

Added back renamed resetPrefs.txt

2015-04-27 19:27:02 +01:00

resource.h

…

sandbox.txt

…