Skip to content

Commit

Permalink
Merge branch 'sync-fork'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Felk
Felk committed Oct 22, 2021
2 parents 99e4c1b + ddcf995 commit be06a5f
Show file tree
Hide file tree
Showing 2,587 changed files with 201,819 additions and 149,043 deletions.
38 changes: 38 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,41 @@

# Reformat Android code
248ee12aed057acd0bdd310359c328e8d4fd5e5a

# Enum and struct indentation cleanup
40182a48a56b8e294e126c64f5f37910a40c67cd
ebb48d019eec1c29a37a406e2db16d7565367faa

# SVN line-ending conversion
30c883bcfc65761dc9fb61fea16a25fb61a7e220
4a0c8fc0c9b6666e7933683260e2befbc81917ff
4b5b9ad05c10d95c9af43502ecc6877d6e680c4d
8fca9a8e8d547653581ecb4aac12a09a4311eba3
a41c1b2d0a9fab51f8a75ccdb7dba0890f766820

# Trailing whitespace
c579637eafb9e9eb7f83711569254bd8da6d09d2
664c8d30a055f4762a2a60be77c1c8eaec1a5d85
84ae817c180556badd1a810fceff4c4168672541
8da425b008b46ef90d649e55c6c0d4a0bc2b556b
8f7c6286f4d4b3e1dccc7076012fe6e593e78c8b

# Additional reformatting
40bb9974f21878e64fb03d70e717cb996bf13a29

# Tabs vs spaces
0e3d8e2e9f1b3eab593b09be986c4ff12a0221e2
16a74a9557779cd15890b0a3bb2924cb4b00ad6f
1db10b139cb1f9b92b2e90eb86f236dcd30333b4
1de39a4a6e6b5ef3ec55bd717d4ba02c02ff8d29
2316cb6876e6d79584ce0cc50771d2fb8495fe45
2d4c3c7c918877c844babaa5ac4c23f8a441fb64
31f037b187525d72c10b83695f780ede1ad9db68
3c6d0fc7106131098fe1a79d2deb0f39671c5252
3fd87a7636ff434118a5d7f7334550be8db55c0b
71ef0a02451393b32fc2304008f87d5b29b61444
7ab0cca6455830a838b1b1e38e2c3f265e4e5d0b
d800b5fb74c077522ef7a0752e49968df46e745e
edd9d0e0ef6898a0528ac6389e93e9fca6132ff6
ee61bd6f2e4db8df8e92be6f92c02b808aa92234
ef85b9af45922c6ca364930d40f8aacf1a6dfe64
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Thumbs.db
# Ignore Finder view option files created by OS X
.DS_Store
# Ignore autogenerated source files
Externals/mGBA/version.c
Source/Core/Common/scmrev.h
# Ignore files output by build
/[Bb]uild*/
Expand Down Expand Up @@ -36,5 +37,6 @@ CMakeLists.txt.user
*.kdev4
# Ignore IDEA/Clion files/dirs
/.idea/
cmake-build-debug/
# Ignore Visual Studio Code's working dir
/.vscode/
5 changes: 5 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
url = https://github.com/dolphin-emu/ext-win-qt.git
branch = master
shallow = true
[submodule "Externals/mGBA/mgba"]
path = Externals/mGBA/mgba
url = https://github.com/mgba-emu/mgba.git
branch = master
shallow = true
[submodule "Externals/python"]
path = Externals/python
url = https://github.com/Felk/ext-python.git
Expand Down
Loading

0 comments on commit be06a5f

Please sign in to comment.