GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit 0a7482b9 authored 5 years ago by

Qt Forward Merge Bot Committed by VaL Doroshchuk 5 years ago

Browse files

Merge remote-tracking branch 'origin/5.13' into 5.14

 Conflicts:
	src/multimedia/video/qvideoframe.cpp
	src/plugins/directshow/player/directshowplayercontrol.cpp

Change-Id: I00840245e35861cf4fe1d62789815ca125b2052a

parents 82770701 56d43096

Branches

Admin message

Merge remote-tracking branch 'origin/5.13' into 5.14