obadz 57ddc155fc Merge branch 'master' into staging ... Conflicts: pkgs/games/scummvm/default.nix		2016-08-28 12:20:59 +01:00
..
3.20	Merge branch 'master' into staging	2016-08-28 12:20:59 +01:00
extensions	treewide: Make explicit that 'dev' output of glib is used	2016-08-23 04:32:21 +03:00