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

src/Makefile.am

@@ -169,6 +169,7 @@ audacity_SOURCES = \
 	MixerBoard.h \
 	ModuleManager.cpp \
 	ModuleManager.h \
+        NumberScale.h \
 	PitchName.cpp \
 	PitchName.h \
 	PlatformCompatibility.cpp \
@@ -239,6 +240,7 @@ audacity_SOURCES = \
 	WaveClip.h \
 	WaveTrack.cpp \
 	WaveTrack.h \
+	WaveTrackLocation.h \
 	WrappedType.cpp \
 	WrappedType.h \
 	commands/AppCommandEvent.cpp \
@@ -452,6 +454,7 @@ audacity_SOURCES = \
 	prefs/ExtImportPrefs.h \
 	prefs/GUIPrefs.cpp \
 	prefs/GUIPrefs.h \
+	prefs/GUISettings.h \
 	prefs/ImportExportPrefs.cpp \
 	prefs/ImportExportPrefs.h \
 	prefs/KeyConfigPrefs.cpp \
@@ -475,6 +478,8 @@ audacity_SOURCES = \
 	prefs/QualityPrefs.h \
 	prefs/RecordingPrefs.cpp \
 	prefs/RecordingPrefs.h \
+	prefs/SpectrogramSettings.cpp \
+	prefs/SpectrogramSettings.h \
 	prefs/SpectrumPrefs.cpp \
 	prefs/SpectrumPrefs.h \
 	prefs/ThemePrefs.cpp \
@@ -483,6 +488,10 @@ audacity_SOURCES = \
 	prefs/TracksPrefs.h \
 	prefs/WarningsPrefs.cpp \
 	prefs/WarningsPrefs.h \
+	prefs/WaveformPrefs.cpp \
+	prefs/WaveformPrefs.h \
+	prefs/WaveformSettings.cpp \
+	prefs/WaveformSettings.h \
 	toolbars/ControlToolBar.cpp \
 	toolbars/ControlToolBar.h \
 	toolbars/DeviceToolBar.cpp \