mirror/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super synced 2025-01-01 09:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up accidentally committed merge conflict

Browse Source 
>.<
This commit is contained in:
hizzlekizzle 2020-01-25 14:54:32 -06:00 committed by GitHub
parent 7be6a813b5
commit efe1ea1934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dist/info/boom3_libretro.info vendored
View File

@ -1,19 +1,8 @@
<<<<<<< 79851c6120c425ef7edbb30eb55af6a2946a08ad:dist/info/boom3_libretro.info
# Software Information
display_name = "Doom 3 (boom3)"
authors = "Rinnegatamante|dhewm3"
supported_extensions = "pk4"
corename = "boom3"
manufacturer = "Id Software"
categories = "Game"
systemname = "Doom 3 Game Engine"
systemid = "doom_3"
=======
# Software Information
display_name = "Doom 3 (dhewm 3)"
authors = "Rinnegatamante and dhewm 3 team"
supported_extensions = "pk4"
corename = "dhewm3"
>>>>>>> more libretro features updates D-F:dist/info/dhewm3_libretro.info
license = "GPLv2"
permissions = ""
display_version = "git"