diff options
| author |  Yuri Kunde Schlesner | 2015-05-29 15:09:26 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-29 15:09:26 -0700 |
| commit | a489a846563fc64f236c7ede69ce0eb34af3521a (patch) | |
| tree | 706e345043532d90cd8ca5c41af67fc31dfa7d2e /src/core/core_timing.cpp | |
| parent | Merge pull request #817 from linkmauve/citra.ico (diff) | |
| parent | Travis: Add a check for trailing whitespace before any actual compilation. (diff) | |
| download | yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.gz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.xz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.zip | |
Merge pull request #818 from linkmauve/no-trailing-whitespace
Ban trailing whitespace from the entire project, forever
Diffstat (limited to 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index f70c84c3d..e53c2e606 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -549,7 +549,7 @@ std::string GetScheduledEventsSummary() { | |||
| 549 | const char* name = event_types[event->type].name; | 549 | const char* name = event_types[event->type].name; |
| 550 | if (!name) | 550 | if (!name) |
| 551 | name = "[unknown]"; | 551 | name = "[unknown]"; |
| 552 | text += Common::StringFromFormat("%s : %i %08x%08x\n", name, (int)event->time, | 552 | text += Common::StringFromFormat("%s : %i %08x%08x\n", name, (int)event->time, |
| 553 | (u32)(event->userdata >> 32), (u32)(event->userdata)); | 553 | (u32)(event->userdata >> 32), (u32)(event->userdata)); |
| 554 | event = event->next; | 554 | event = event->next; |
| 555 | } | 555 | } |