preserve-emulation/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-07-11 01:24:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into GLSL-master

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
degasus
2013-03-12 11:28:56 +01:00
parent e1ca002937 83fc5f4747
commit 382be2aabd
87 changed files with 23863 additions and 38776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -37,3 +37,5 @@ Source/Core/Common/Src/scmrev.h
Externals/scons-local/*
.DS_Store
*~
#Ignore transifix configuration directory
.tx