Merge branch 'master' into next
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>
Wed, 12 Aug 2020 14:49:22 +0000 (16:49 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Wed, 12 Aug 2020 14:49:22 +0000 (16:49 +0200)
commit336b4a639a3678a1fca0db0a6e89f1dc661e9e80
tree1592e76f3eb8640342c593768d65ccef46c85596
parent22c7cfc3580d78d8381be5f1724806cbc3cc402e
parentd1d89d37c02e3d8224fb6f812e87fef5612a771a
Merge branch 'master' into next
package/libcamera/libcamera.mk
package/prosody/Config.in
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk