diff options
| author | 2013-09-26 17:34:48 -0400 | |
|---|---|---|
| committer | 2013-09-26 17:34:48 -0400 | |
| commit | 8bb0c457bca110ca80fd3d09e78a794600a7221a (patch) | |
| tree | 31023ba8d5839b836d4b49b31f9a74261c0540d1 /src/common | |
| parent | added meta_file_system to project (diff) | |
| download | yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.gz yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.tar.xz yuzu-8bb0c457bca110ca80fd3d09e78a794600a7221a.zip | |
renamed from citrus to citra
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 @@ | |||
| 26 | #ifdef USER_DIR | 26 | #ifdef USER_DIR |
| 27 | #define EMU_DATA_DIR USER_DIR | 27 | #define EMU_DATA_DIR USER_DIR |
| 28 | #else | 28 | #else |
| 29 | #define EMU_DATA_DIR ".citrus" | 29 | #define EMU_DATA_DIR ".emu" |
| 30 | #endif | 30 | #endif |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
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: | |||
| 81 | protected: | 81 | protected: |
| 82 | EmuWindow() : client_area_width_(640), client_area_height_(480) { | 82 | EmuWindow() : client_area_width_(640), client_area_height_(480) { |
| 83 | char window_title[255]; | 83 | char window_title[255]; |
| 84 | sprintf(window_title, "citrus [%s|%s] - %s", | 84 | sprintf(window_title, "emu [%s|%s] - %s", |
| 85 | "null-cpu", | 85 | "null-cpu", |
| 86 | "null-renderer", | 86 | "null-renderer", |
| 87 | __DATE__); | 87 | __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 @@ | |||
| 1 | #define SCM_REV_STR "bfa6493324336066a1ef9d04f336faacae57d9f3" | 1 | #define SCM_REV_STR "a7b06698ff012aa7b1094414e796ffae1ca1eb4d" |
| 2 | #define SCM_DESC_STR "bfa6493" | 2 | #define SCM_DESC_STR "a7b0669" |
| 3 | #define SCM_BRANCH_STR "master" | 3 | #define SCM_BRANCH_STR "master" |
| 4 | #define SCM_IS_MASTER 1 | 4 | #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 @@ | |||
| 13 | #define BUILD_TYPE_STR "" | 13 | #define BUILD_TYPE_STR "" |
| 14 | #endif | 14 | #endif |
| 15 | 15 | ||
| 16 | const char *scm_rev_str = "citrus " | 16 | const char *scm_rev_str = "emu " |
| 17 | #if !SCM_IS_MASTER | 17 | #if !SCM_IS_MASTER |
| 18 | "[" SCM_BRANCH_STR "] " | 18 | "[" SCM_BRANCH_STR "] " |
| 19 | #endif | 19 | #endif |