MergeApp.h: Fix mixed eol-style

diff --git a/Src/MergeApp.h b/Src/MergeApp.h
index 4b013fa..4ffc57c 100644 (file)
--- a/Src/MergeApp.h
+++ b/Src/MergeApp.h
@@ -1,50 +1,50 @@
-#pragma once
-
-#include "UnicodeString.h"
-
-#define _(x) tr(x)
-#define N_(x) (x)
-#define NC_(c, x) (x)
-
-class COptionsMgr;
-class FileFilterHelper;
-
-struct AboutInfo
-{
-       AboutInfo();
-       String copyright;
-       String version;
-       String developers;
-       String private_build;
-       String website;
-};
-
-/** @brief Retrieve error description from Windows; uses FormatMessage */
-String GetSysError(int nerr = -1);
-
-COptionsMgr * GetOptionsMgr();
-void LogErrorString(const String& sz);
-void LogErrorStringUTF8(const std::string& sz);
-void AppErrorMessageBox(const String& msg);
-
-namespace AppMsgBox
-{
-       enum
-       {
-               YES = 1,
-               OK = 2,
-               NO = 4,
-               CANCEL = 8,
-               YES_TO_ALL = 16,
-               DONT_DISPLAY_AGAIN = 32,
-       };
-       int error(const String& msg, int type = OK);
-       int warning(const String& msg, int type = OK);
-       int information(const String& msg, int type = OK);
-};
-
-/** @brief Load string from string resources; shortcut for String::LoadString */
-String LoadResString(unsigned id);
-
+#pragma once\r
+\r
+#include "UnicodeString.h"\r
+\r
+#define _(x) tr(x)\r
+#define N_(x) (x)\r
+#define NC_(c, x) (x)\r
+\r
+class COptionsMgr;\r
+class FileFilterHelper;\r
+\r
+struct AboutInfo\r
+{\r
+       AboutInfo();\r
+       String copyright;\r
+       String version;\r
+       String developers;\r
+       String private_build;\r
+       String website;\r
+};\r
+\r
+/** @brief Retrieve error description from Windows; uses FormatMessage */\r
+String GetSysError(int nerr = -1);\r
+\r
+COptionsMgr * GetOptionsMgr();\r
+void LogErrorString(const String& sz);\r
+void LogErrorStringUTF8(const std::string& sz);\r
+void AppErrorMessageBox(const String& msg);\r
+\r
+namespace AppMsgBox\r
+{\r
+       enum\r
+       {\r
+               YES = 1,\r
+               OK = 2,\r
+               NO = 4,\r
+               CANCEL = 8,\r
+               YES_TO_ALL = 16,\r
+               DONT_DISPLAY_AGAIN = 32,\r
+       };\r
+       int error(const String& msg, int type = OK);\r
+       int warning(const String& msg, int type = OK);\r
+       int information(const String& msg, int type = OK);\r
+};\r
+\r
+/** @brief Load string from string resources; shortcut for String::LoadString */\r
+String LoadResString(unsigned id);\r
+\r
 String tr(const std::string &str);\r
 String tr(const char *msgctxt, const std::string &str);
\ No newline at end of file