1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-16 15:57: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

@@ -16,6 +16,7 @@ of the BlockFile system.
#include "Audacity.h"
#include "Benchmark.h"
#include <wx/log.h>
#include <wx/textctrl.h>
@@ -33,7 +34,7 @@ of the BlockFile system.
#include <wx/valtext.h>
#include <wx/intl.h>
#include "Benchmark.h"
#include "ShuttleGui.h"
#include "Project.h"
#include "WaveTrack.h"
#include "Sequence.h"