Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging ...

Conflicts:
      pkgs/development/libraries/qt-5/5.7/qtbase/default.nix

2017-03-14 00:49:22 +02:00

..

backends

Merge branch 'master' into phonon-gstreamer

2017-03-10 07:30:14 -06:00

default.nix

phonon: 4.9.0 -> 4.9.1

2017-03-04 15:08:47 -06:00