ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
DeSmuME is a Nintendo DS emulator
5,315 Commits 20 Branches 16 Tags 108 MiB
C 47.3%
C++ 46.1%
Objective-C++ 4.3%
Objective-C 0.8%
Metal 0.6%
Other 0.5%
Go to file
zeromus f97283e9bc Merge branch 'master' into round-1-start 
# Conflicts:
#	desmume/src/frontend/windows/DeSmuME.vcxproj.filters
#	desmume/src/libretro-common/rthreads/rthreads.c
#	desmume/src/texcache.cpp
#	desmume/src/utils/vfat.cpp
 		2016-11-23 21:13:34 -06:00
desmume Merge branch 'master' into round-1-start 2016-11-23 21:13:34 -06:00
tools delete vio2sf; kode54 decided to maintain it. see https://bitbucket.org/kode54/vio2sf 2016-03-19 07:37:36 +00:00
.gitignore .gitignore 2016-11-23 21:06:38 -06:00