Merge branch 'master' of git@github.com:optixx/snesram
Conflicts: tools/ffsample/linux/diskio.c
This commit is contained in:
5
.gitignore
vendored
5
.gitignore
vendored
@@ -21,3 +21,8 @@
|
||||
*.swc
|
||||
*.rom
|
||||
*.usage
|
||||
*.moc
|
||||
*.obj
|
||||
*.TMP
|
||||
*.vfat
|
||||
*.wla*
|
||||
|
||||
Reference in New Issue
Block a user