diff options
| author |  lat9nq | 2021-07-25 15:31:33 -0400 |
|---|---|---|
| committer |  GitHub | 2021-07-25 15:31:33 -0400 |
| commit | 09d6cc99435322c5f480eaa2b0967e33f4966ba6 (patch) | |
| tree | 72cdf06f6b7d77fdf5826104fea691f3ea450f54 /src/common/scm_rev.cpp.in | |
| parent | configuration: Use combobox apply template where possible (diff) | |
| parent | Merge pull request #6575 from FernandoS27/new_settings (diff) | |
| download | yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.tar.gz yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.tar.xz yuzu-09d6cc99435322c5f480eaa2b0967e33f4966ba6.zip | |
Merge branch 'master' into fullscreen-enum
Diffstat (limited to 'src/common/scm_rev.cpp.in')
| -rw-r--r-- | src/common/scm_rev.cpp.in | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.in index 5f126f324..cc88994c6 100644 --- a/src/common/scm_rev.cpp.in +++ b/src/common/scm_rev.cpp.in | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #define BUILD_ID "@BUILD_ID@" | 14 | #define BUILD_ID "@BUILD_ID@" |
| 15 | #define TITLE_BAR_FORMAT_IDLE "@TITLE_BAR_FORMAT_IDLE@" | 15 | #define TITLE_BAR_FORMAT_IDLE "@TITLE_BAR_FORMAT_IDLE@" |
| 16 | #define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@" | 16 | #define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@" |
| 17 | #define SHADER_CACHE_VERSION "@SHADER_CACHE_VERSION@" | ||
| 18 | 17 | ||
| 19 | namespace Common { | 18 | namespace Common { |
| 20 | 19 | ||
| @@ -28,7 +27,6 @@ const char g_build_version[] = BUILD_VERSION; | |||
| 28 | const char g_build_id[] = BUILD_ID; | 27 | const char g_build_id[] = BUILD_ID; |
| 29 | const char g_title_bar_format_idle[] = TITLE_BAR_FORMAT_IDLE; | 28 | const char g_title_bar_format_idle[] = TITLE_BAR_FORMAT_IDLE; |
| 30 | const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING; | 29 | const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING; |
| 31 | const char g_shader_cache_version[] = SHADER_CACHE_VERSION; | ||
| 32 | 30 | ||
| 33 | } // namespace | 31 | } // namespace |
| 34 | 32 | ||