diff options
| author | ShizZy <shizzy@6bit.net> | 2013-09-26 23:34:48 +0200 |
|---|---|---|
| committer | ShizZy <shizzy@6bit.net> | 2013-09-26 23:34:48 +0200 |
| commit | 8bb0c457bca110ca80fd3d09e78a794600a7221a (patch) | |
| tree | 31023ba8d5839b836d4b49b31f9a74261c0540d1 /src/common | |
| parent | added meta_file_system to project (diff) | |
| download | yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.gz yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.bz2 yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.lz yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.xz yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.zst yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.zip | |
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/src/common_paths.h | 2 | ||||
| -rw-r--r-- | src/common/src/emu_window.h | 2 | ||||
| -rw-r--r-- | src/common/src/scm_rev.h | 4 | ||||
| -rw-r--r-- | src/common/src/version.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/common/src/common_paths.h b/src/common/src/common_paths.h index 1ad887a79..30bd4b742 100644 --- a/src/common/src/common_paths.h +++ b/src/common/src/common_paths.h @@ -26,7 +26,7 @@ #ifdef USER_DIR #define EMU_DATA_DIR USER_DIR #else - #define EMU_DATA_DIR ".citrus" + #define EMU_DATA_DIR ".emu" #endif #endif diff --git a/src/common/src/emu_window.h b/src/common/src/emu_window.h index 12b475934..2427b5b6a 100644 --- a/src/common/src/emu_window.h +++ b/src/common/src/emu_window.h @@ -81,7 +81,7 @@ public: protected: EmuWindow() : client_area_width_(640), client_area_height_(480) { char window_title[255]; - sprintf(window_title, "citrus [%s|%s] - %s", + sprintf(window_title, "emu [%s|%s] - %s", "null-cpu", "null-renderer", __DATE__); diff --git a/src/common/src/scm_rev.h b/src/common/src/scm_rev.h index 05ad76964..69962c58e 100644 --- a/src/common/src/scm_rev.h +++ b/src/common/src/scm_rev.h @@ -1,4 +1,4 @@ -#define SCM_REV_STR "bfa6493324336066a1ef9d04f336faacae57d9f3" -#define SCM_DESC_STR "bfa6493" +#define SCM_REV_STR "a7b06698ff012aa7b1094414e796ffae1ca1eb4d" +#define SCM_DESC_STR "a7b0669" #define SCM_BRANCH_STR "master" #define SCM_IS_MASTER 1 diff --git a/src/common/src/version.cpp b/src/common/src/version.cpp index f4010b6df..25e99b21a 100644 --- a/src/common/src/version.cpp +++ b/src/common/src/version.cpp @@ -13,7 +13,7 @@ #define BUILD_TYPE_STR "" #endif -const char *scm_rev_str = "citrus " +const char *scm_rev_str = "emu " #if !SCM_IS_MASTER "[" SCM_BRANCH_STR "] " #endif |