summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Version.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2016-06-24 10:43:46 +0200
committerPierre Bourdon <delroth@gmail.com>2016-06-24 10:43:46 +0200
commit3570c7f03a2aa90aa634f96c0af1969af610f14d (patch)
tree4252e03c0e853ba7cffe022937698c854ad0eaa9 /Source/Core/Common/Version.cpp
parent2115e8a4a6814e32107b5205ff5c95bbd3c6e99c (diff)
Reformat all the things. Have fun with merge conflicts.
Diffstat (limited to 'Source/Core/Common/Version.cpp')
-rw-r--r--Source/Core/Common/Version.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp
index c02a83a21c..c21896afdc 100644
--- a/Source/Core/Common/Version.cpp
+++ b/Source/Core/Common/Version.cpp
@@ -2,26 +2,26 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
-#include "scmrev.h"
#include "Common/Common.h"
+#include "scmrev.h"
#ifdef _DEBUG
- #define BUILD_TYPE_STR "Debug "
+#define BUILD_TYPE_STR "Debug "
#elif defined DEBUGFAST
- #define BUILD_TYPE_STR "DebugFast "
+#define BUILD_TYPE_STR "DebugFast "
#else
- #define BUILD_TYPE_STR ""
+#define BUILD_TYPE_STR ""
#endif
const std::string scm_rev_str = "Dolphin "
#if !SCM_IS_MASTER
- "[" SCM_BRANCH_STR "] "
+ "[" SCM_BRANCH_STR "] "
#endif
#ifdef __INTEL_COMPILER
- BUILD_TYPE_STR SCM_DESC_STR "-ICC";
+ BUILD_TYPE_STR SCM_DESC_STR "-ICC";
#else
- BUILD_TYPE_STR SCM_DESC_STR;
+ BUILD_TYPE_STR SCM_DESC_STR;
#endif
#ifdef _WIN32
@@ -29,7 +29,7 @@ const std::string netplay_dolphin_ver = SCM_DESC_STR " Win";
#elif __APPLE__
const std::string netplay_dolphin_ver = SCM_DESC_STR " Mac";
#else
-const std::string netplay_dolphin_ver = SCM_DESC_STR " Lin";
+ const std::string netplay_dolphin_ver = SCM_DESC_STR " Lin";
#endif
const std::string scm_rev_git_str = SCM_REV_STR;