Skip to content

Commit

Permalink
Merge branch 'mamedev:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
yeager authored Jan 19, 2025
2 parents 526c919 + 9359d54 commit 3da1f65
Show file tree
Hide file tree
Showing 163 changed files with 6,574 additions and 4,536 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libsdl2-dev libsdl2-ttf-dev libasound2-dev libxinerama-dev libxi-dev qtbase5-dev qtbase5-dev-tools
sudo apt-get install -y libsdl2-dev libsdl2-ttf-dev libfontconfig-dev libasound2-dev libxinerama-dev libxi-dev qtbase5-dev qtbase5-dev-tools
- name: Install clang
if: matrix.compiler == 'clang'
run: sudo apt-get install -y clang
Expand Down
4 changes: 3 additions & 1 deletion hash/amigaaga_flop.xml
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ Corrupt tiles if you switch languages in language select menu

<software name="brutaldx" supported="no">
<!-- SPS (CAPS) release 1837 -->
<description>Brutal Football - Deluxe Edition (Europe)</description>
<description>Brutal Sports Series: Football - Deluxe Edition (Europe)</description>
<!-- retail, standalone -->
<!-- (Amiga, AGA, PAL) -->
<year>1993</year>
Expand All @@ -654,6 +654,8 @@ Corrupt tiles if you switch languages in language select menu
Not extensively tested
Gameplay is too fast
]]></notes>
<!-- cover/floppy title -->
<info name="alt_title" value="Brutal Football" />
<info name="usage" value="Requires AGA" />
<part name="flop1" interface="floppy_3_5">
<feature name="part_id" value="Disk 1" />
Expand Down
Loading

0 comments on commit 3da1f65

Please sign in to comment.