diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 11:45:45 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 11:45:45 -0700 |
| commit | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch) | |
| tree | a180a736708834708e0e5b95fd1720f37722b429 /src/citra_qt/main.cpp | |
| parent | 337f1e1b96445b81c40c313b1bf680fe660f14f5 (diff) | |
| parent | c956e8a6869d0ee1edd68a6ab880efa6bf1fbe70 (diff) | |
Merge pull request #721 from yuriks/more-cleanups
More cleanups
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index dd0e4de8..d15338f0 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -10,7 +10,6 @@ #include "qhexedit.h" #include "main.h" -#include "common/common.h" #include "common/logging/text_formatter.h" #include "common/logging/log.h" #include "common/logging/backend.h" @@ -349,7 +348,7 @@ void GMainWindow::closeEvent(QCloseEvent* event) #undef main #endif -int __cdecl main(int argc, char* argv[]) +int main(int argc, char* argv[]) { std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger(); Log::Filter log_filter(Log::Level::Info); |