1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-17 00:07:54 +01:00

Merge remote-tracking branch 'upstream/master' into wx3

This commit is contained in:
Leland Lucius
2015-07-19 18:00:02 -05:00
127 changed files with 2284 additions and 1702 deletions

View File

@@ -8,6 +8,9 @@
**********************************************************************/
#include "../Audacity.h"
#include "ExportPCM.h"
#include <wx/defs.h>
#include <wx/choice.h>
@@ -23,20 +26,19 @@
#include "sndfile.h"
#include "../Audacity.h"
#include "../FileFormats.h"
#include "../Internat.h"
#include "../LabelTrack.h"
#include "../Mix.h"
#include "../Prefs.h"
#include "../Project.h"
#include "../ShuttleGui.h"
#include "../Tags.h"
#include "../Track.h"
#include "../WaveTrack.h"
#include "../ondemand/ODManager.h"
#include "Export.h"
#include "ExportPCM.h"
#ifdef USE_LIBID3TAG
#include <id3tag.h>