Vladimír Čunát b1acaffe67 Merge branch 'master' into staging		2016-01-05 10:28:58 +01:00
..
applications	Merge branch 'master' into staging	2016-01-05 10:28:58 +01:00
build-support	fetchgitLocal: make it work in submodules	2016-01-04 15:09:00 -08:00
data	cantarell_fonts: update from 0.0.16 to 0.0.17	2016-01-03 20:51:14 +00:00
desktops	system-config-printer: align attrname with pkgname	2016-01-03 15:18:04 +01:00
development	Merge branch 'master' into staging	2016-01-05 10:28:58 +01:00
games	simutrans: preferLocalBuild = true; for data derivations	2016-01-03 10:27:50 +01:00
misc	Merge #11927: wine: add pulseaudio support	2016-01-05 09:25:46 +01:00
os-specific	uksmtools: add 1-line comment to clarify fetchgit use...	2016-01-04 04:07:33 +01:00
servers	Merge branch 'master' into staging	2016-01-05 10:28:58 +01:00
shells	Merge pull request #12000 from nathan7/nix-auto-run	2016-01-03 03:22:50 +03:00
stdenv	Merge branch 'master' into staging	2016-01-05 10:28:58 +01:00
test
tools	Merge branch 'master' into staging	2016-01-05 10:28:58 +01:00
top-level	Merge branch 'master' into staging	2016-01-05 10:28:58 +01:00