Jörg Thalheim 1a931f1f60 Revert "Revert "ffmpeg: fix cross compilation"" ... This reverts commit 7d46f7363c. This change was accidentally commit to master. To avoid a mass-rebuild we actually apply this change on staging first.		2020-01-04 08:26:03 +00:00
..
applications	Merge staging-next into staging	2020-01-03 13:18:04 +01:00
build-support	Merge pull request #75563 from andir/cleanup-buildRustCrate	2020-01-02 13:42:33 +01:00
common-updater
data	Merge master into staging-next	2020-01-02 21:41:13 +01:00
desktops	treewide: *inputs are lists	2019-12-31 01:09:25 +01:00
development	Revert "Revert "ffmpeg: fix cross compilation""	2020-01-04 08:26:03 +00:00
games	Merge master into staging-next	2020-01-03 10:25:14 +01:00
misc	Merge branch 'staging' into staging-next	2019-12-31 03:59:58 +01:00
os-specific	Merge pull request #74284 from matthewbauer/ios-with-xcode-11	2020-01-03 15:35:41 -05:00
servers	Merge master into staging-next	2020-01-03 10:25:14 +01:00
shells	Merge master into staging-next	2020-01-02 21:41:13 +01:00
stdenv	Merge pull request #74090 from obsidiansystems/ghcjs-cross-without-cc	2019-12-30 16:40:43 -08:00
test
tools	Merge staging-next into staging	2020-01-03 13:18:04 +01:00
top-level	Merge pull request #74284 from matthewbauer/ios-with-xcode-11	2020-01-03 15:35:41 -05:00