obadz 3de6e5be50 Merge branch 'master' into staging ... Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix		2016-08-27 23:54:54 +01:00
..
config	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
hardware	Merge branch 'master' into staging	2016-08-21 12:03:41 +01:00
i18n/input-method	fcitx-unikey: mention in dockbook	2016-08-12 14:36:36 +07:00
installer	nixos-install: remove manifest related stuff	2016-08-24 16:09:30 +01:00
misc	Merge nixpkgs.config.perlPackageOverrides	2016-08-24 19:58:45 +02:00
profiles	documentation: fix start display-manager command	2016-07-04 10:25:31 +02:00
programs	nixos/shadow: setuid wrappers for new{uid,gid}map	2016-08-19 14:59:33 +02:00
security	Merge pull request #11484 from oxij/nixos-toposort-filesystems	2016-08-27 14:34:55 +04:00
services	nixos/doc/gitlab: fix build	2016-08-26 15:47:39 +02:00
system	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
tasks	Merge pull request #11484 from oxij/nixos-toposort-filesystems	2016-08-27 14:34:55 +04:00
testing	KDE test: Bump kdm start timeout	2016-05-27 11:22:27 +02:00
virtualisation	virtualbox-image: use vmdk wrapper instead of vdi copy (avoids 1 disk copy)	2016-08-27 03:02:53 +01:00
module-list.nix	ferm: init at 2.3	2016-08-25 21:37:19 +02:00
rename.nix	fontconfig-ultimate: 2015-12-06 -> 2016-04-23	2016-08-20 03:21:05 +03:00