Florian Friesdorf ddbd5c2eba Merge branch 'py/offline-distutils' into python-merge ... Conflicts: pkgs/development/python-modules/generic/default.nix		2012-11-23 17:28:51 +01:00
..
applications	chromium: Add dependency on pciutils for v25.	2012-11-20 04:55:45 +01:00
build-support
data
desktops
development	Merge branch 'py/offline-distutils' into python-merge	2012-11-23 17:28:51 +01:00
games
lib
misc
os-specific	iwlwifi-6000g2a-ucode: update to version 18.168.6.1	2012-11-18 13:20:46 +01:00
servers	xf86 video openchrome: fixing the build, changing overrides.	2012-11-18 22:19:00 +01:00
shells
stdenv
test
tools	smartmontools: update drivedb file to trunk revision 3605	2012-11-20 11:16:32 +01:00
top-level	Merge branch 'py/offline-distutils' into python-merge	2012-11-23 17:28:51 +01:00