legacy branch: merge r3209-r3382 from trunk (the translations aren't up to date with any implications this may have)legacy

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@3383 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 5 insertions, 5 deletions

diff --git a/src/apps/mplayerc/PPageSheet.h b/src/apps/mplayerc/PPageSheet.h
index 48a01edf0..2a17fddec 100644
--- a/src/apps/mplayerc/PPageSheet.h
+++ b/src/apps/mplayerc/PPageSheet.h
@@ -72,21 +72,21 @@ private:
 	CPPageFormats m_formats;

 	CPPageAccelTbl m_acceltbl;

 	CPPageLogo m_logo;

+	CPPageWebServer m_webserver;

 	CPPagePlayback m_playback;

 	CPPageDVD m_dvd;

 	CPPageOutput m_output;

 	CPPageFullscreen m_fullscreen;

 	CPPageSync m_sync;

-	CPPageWebServer m_webserver;

-	CPPageSubtitles m_subtitles;

-	CPPageSubStyle m_substyle;

-	CPPageSubMisc m_subMisc;

+	CPPageCapture m_tuner;

 	CPPageInternalFilters m_internalfilters;

 	CPPageAudioSwitcher m_audioswitcher;

 	CPPageExternalFilters m_externalfilters;

+	CPPageSubtitles m_subtitles;

+	CPPageSubStyle m_substyle;

+	CPPageSubMisc m_subMisc;

 	CPPageTweaks m_tweaks;

 	CPPageCasimir m_casimir;

-	CPPageCapture m_tuner;

 

 	CTreeCtrl* CreatePageTreeObject();