James Crook 0db05760a8 Merge remote-tracking branch 'upstream/master' into darkaudacity ...

Conflicts fixed by hand:
	src/widgets/Ruler.cpp

2016-08-17 15:28:39 +01:00

..

LADSPA_plugins-win

Introduce end-of-line normalization

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

Projects

Make headers in import directory self-contained

2016-08-11 11:51:33 -04:00

wxWidgets_additions

Revised workaround for bug #1266

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

audacity_InnoWizard_InfoBefore.rtf

Introduce end-of-line normalization

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

audacity_InnoWizardImage.bmp

Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches

2010-01-23 19:44:49 +00:00

audacity_InnoWizardSmallImage.bmp

Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches

2010-01-23 19:44:49 +00:00

audacity.ico

Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches

2010-01-23 19:44:49 +00:00

audacity.iss

Introduce end-of-line normalization

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

audacity.rc

Update copyright year

2016-07-03 17:33:21 +01:00

audacity.sln

Introduce end-of-line normalization

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

compile.txt

Mark Young's change to download Audacity as step 2

2016-08-15 23:10:50 +01: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

Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches

2010-01-23 19:44:49 +00:00

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

Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches

2010-01-23 19:44:49 +00:00

release.txt

Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches

2010-01-23 19:44:49 +00:00

resetPrefsRenamed.txt

Added back renamed resetPrefs.txt

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

resource.h

Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches

2010-01-23 19:44:49 +00:00

sandbox.txt

Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches

2010-01-23 19:44:49 +00:00