Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/networking/browsers/vivaldi/default.nix pkgs/misc/emulators/wine/base.nix		2016-05-03 23:12:48 +03:00
..
config
hardware
i18n/input-method
installer
misc
profiles
programs
security	grsecurity module: fix grsec-lock unit ordering	2016-05-02 11:28:24 +02:00
services	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
system	dbus: Fix for new 1.10 version	2016-05-02 13:04:20 -05:00
tasks
testing
virtualisation
module-list.nix
rename.nix