CCF_100/suyu-mirror
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2025-08-27 14:36:33 -05:00
Code Issues Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
darkf
2014-12-29 19:47:41 -08:00
parent a19354aced 3d14eb2853
commit 8ba9ac0f74
288 changed files with 17413 additions and 13969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/thread.cpp
View File

@@ -1,5 +1,5 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/thread.h"