Arseniy Seroka ff22e19fc4 Merge pull request #6893 from hrdinka/nsd-config-options ... nsd: Fix automatic config options		2015-03-23 13:19:29 +03:00
..
applications	Merge pull request #6902 from vandenoever/davmail	2015-03-23 13:16:13 +03:00
build-support	Merge branch 'master' into staging	2015-03-17 13:35:05 +01:00
data	Update tempora-lgc source link as the original site seems to be permanently down	2015-03-21 19:11:09 +03:00
desktops	startkde: Fix kdostartupconfig5 path	2015-03-21 18:56:59 -05:00
development	Merge pull request #6938 from j-keck/sbt	2015-03-23 13:12:57 +03:00
games	steam: fix: add gst lib (needed by audiosurf 2)	2015-03-21 02:54:32 +03:00
misc	myEnvFun: use stderr instead of stdout for messages	2015-03-22 18:24:35 +01:00
os-specific	zfs_git: 2015-03-12 -> 2015-03-20	2015-03-22 12:20:53 -07:00
servers	Merge pull request #6893 from hrdinka/nsd-config-options	2015-03-23 13:19:29 +03:00
shells	Set some meta.platforms	2015-03-20 20:04:42 +01:00
stdenv	Fix eval-release.nix evaluation	2015-03-06 15:09:51 +01:00
test
tools	nixpkgs: afl - add QEMU support	2015-03-22 22:52:57 -05:00
top-level	Merge pull request #6867 from risicle/master	2015-03-23 10:03:12 +01:00