Merge branch 'master' of https://github.com/libretro/libretro-super

COPYING

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 The RetroArch team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

dist/info/boom3_libretro.info

@@ -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"