1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-07 06:55:52 +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

@@ -33,6 +33,7 @@
*/
#include "../Audacity.h"
#include "ExportMP2.h"
#ifdef USE_LIBTWOLAME
@@ -47,12 +48,12 @@
#include <wx/intl.h>
#include "Export.h"
#include "ExportMP2.h"
#include "../FileIO.h"
#include "../Internat.h"
#include "../Mix.h"
#include "../Prefs.h"
#include "../Project.h"
#include "../ShuttleGui.h"
#include "../Tags.h"
#include "../WaveTrack.h"