Wii U travis build broken (OK to merge now)

libretro / hatari

New rebasing of Hatari based on Mercurial upstream. Tries to be a shallow fork for easy upstreaming later on.

25 stars 41 forks source link

Closed bbbradsmith closed 3 years ago

bbbradsmith commented 3 years ago

Testing whether the header is enough to make the previous code build. Please do not merge unless this actually fixes the travis build.

inactive123 commented 3 years ago

Hmm, seems like you need to resolve the conflict first.

bbbradsmith commented 3 years ago

OK that worked, feel free to merge