Vladimír Čunát b5fba47147 Merge branch master into x-updates ... Conflicts (not used, deleted): pkgs/desktops/xfce/common.nix		2013-11-23 10:22:26 +01:00
..
applications	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
build-support
data
desktops	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
development	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
games	Merge pull request #1236 from lovek323/sdlmame	2013-11-22 23:24:35 -08:00
misc
os-specific	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
servers	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
shells
stdenv
test
tools	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
top-level	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00