Merge from dev-FireflyShell branch

win32/FireflyShell/LogPage.cpp

@@ -0,0 +1,23 @@
+/*
+ *(C) 2006 Roku LLC
+ *
+ * This program is free software; you can redistribute it and/or modify it 
+ * under the terms of the GNU General Public License Version 2 as published 
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but 
+ * without any warranty; without even the implied warranty of 
+ * merchantability or fitness for a particular purpose. See the GNU General 
+ * Public License for more details.
+ *
+ * Please read README.txt in the same directory as this source file for 
+ * further license information.
+ */
+
+#include "stdafx.h"
+#include "LogPage.h"
+
+LRESULT CLogPage::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
+{
+	return 0;
+}