Merge branch 'svn/trunk' r4335

Browse source

Both new SVN commits are irrelevant to dosbox-staging:

- overlay output does not exist any more since SDL2
- we already switched to OpenGL on all OSes, not only macOS

Changes were removed during conflict resolution. Keeping empty merge
commit to aid in future imports.

...

This commit is contained in:

Patryk Obara 2020-03-12 06:43:16 +01:00

parent 07f38c8ee3 11c380aaba

commit d125b61f66

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available