Merge branch 'master' into core-updates
authorRicardo Wurmus <rekado@elephly.net>
Mon, 4 Jun 2018 09:25:48 +0000 (11:25 +0200)
committerRicardo Wurmus <rekado@elephly.net>
Mon, 4 Jun 2018 09:25:48 +0000 (11:25 +0200)
1  2 
gnu/local.mk
gnu/packages/qt.scm

diff --cc gnu/local.mk
Simple merge
Simple merge