James Crook 5fb8fc766d Merge remote-tracking branch 'upstream/master' into darkaudacityrelease ...

Conflicts resolved by hand:
	src/Menus.cpp
	src/TrackPanelAx.cpp

2016-10-24 15:53:13 +01:00

..

LADSPA_plugins-win

Fix doubled 'http://'

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

Projects

clicktrack.ny -> rhythmtrack.ny on windows too

2016-09-30 09:12:51 +01: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

Image/Icon changes for Logo.

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

audacity.rc

Start of hackery to reduce differences between DarkAudacity and Audacity

2016-09-10 23:39:09 +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