mGBA Game Boy Advance Emulator
Go to file
Jeffrey Pfau 6560db2ef5 Merge branch 'master' into qt
Conflicts:
	CMakeLists.txt
2014-10-07 02:50:57 -07:00
res Windows ICO file 2014-08-13 00:25:24 -07:00
src Merge branch 'master' into qt 2014-10-07 02:50:57 -07:00
.gitignore Ignore swapfiles 2014-04-23 02:05:50 -07:00
CMakeLists.txt Merge branch 'master' into qt 2014-10-07 02:50:57 -07:00