summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-03-26 23:37:05 -0400
committerGitHub <noreply@github.com>2018-03-26 23:37:05 -0400
commit1a28f4fa8c94ad43d757eeb7fc137024f356db87 (patch)
tree206bb2c17cd77562691bcb1bba79fd54bad9d68e
parentb4bf099793d8e9a065769c35bb4b8e20bf107549 (diff)
parent3357e8d9ba6a3002f032ca911464faa078c75cde (diff)
Merge pull request #282 from N00byKing/patch-2
Change comments from citra to yuzu
-rwxr-xr-xhooks/pre-commit2
-rw-r--r--src/common/file_util.h2
-rw-r--r--src/common/logging/log.h2
-rw-r--r--src/common/x64/cpu_detect.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/hooks/pre-commit b/hooks/pre-commit
index 098a99216..e376ed4d8 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -1,6 +1,6 @@
#!/bin/sh
-# Enforce citra's whitespace policy
+# Enforce yuzu's whitespace policy
git config --local core.whitespace tab-in-indent,trailing-space
paths_to_check="src/ CMakeLists.txt"
diff --git a/src/common/file_util.h b/src/common/file_util.h
index 630232a25..143f099eb 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -121,7 +121,7 @@ void CopyDir(const std::string& source_path, const std::string& dest_path);
// Set the current directory to given directory
bool SetCurrentDir(const std::string& directory);
-// Returns a pointer to a string with a Citra data dir in the user's home
+// Returns a pointer to a string with a yuzu data dir in the user's home
// directory. To be used in "multi-user" mode (that is, installed).
const std::string& GetUserPath(const unsigned int DirIDX, const std::string& newPath = "");
diff --git a/src/common/logging/log.h b/src/common/logging/log.h
index d8dbab939..6913f6b10 100644
--- a/src/common/logging/log.h
+++ b/src/common/logging/log.h
@@ -85,7 +85,7 @@ enum class Class : ClassType {
Loader, ///< ROM loader
Input, ///< Input emulation
Network, ///< Network emulation
- WebService, ///< Interface to Citra Web Services
+ WebService, ///< Interface to yuzu Web Services
Count ///< Total number of logging classes
};
diff --git a/src/common/x64/cpu_detect.cpp b/src/common/x64/cpu_detect.cpp
index 62f17fbb5..2dfcd39c8 100644
--- a/src/common/x64/cpu_detect.cpp
+++ b/src/common/x64/cpu_detect.cpp
@@ -54,7 +54,7 @@ static CPUCaps Detect() {
caps.num_cores = std::thread::hardware_concurrency();
// Assumes the CPU supports the CPUID instruction. Those that don't would likely not support
- // Citra at all anyway
+ // yuzu at all anyway
int cpu_id[4];
memset(caps.brand_string, 0, sizeof(caps.brand_string));