Shadowfire 10cac44a5b its fixed, now, yes. ...

also added comments on media tracks

2020-02-17 15:25:34 +01:00

..

media_machinery.dm

Sorts out this PR

2019-03-26 21:43:56 -04:00

media_player_html5.dm

…

media_player_vlc.dm

…

media_player_wmp.dm

…

media_tracks.dm

its fixed, now, yes.

2020-02-17 15:25:34 +01:00

mediamanager.dm

Conflict Resolution Part 2

2019-03-27 15:51:05 -04:00