Florian Friesdorf 24fd592d64 Merge branch 'py/always-unzip' into python-merge ... Conflicts: pkgs/development/python-modules/generic/default.nix		2012-11-22 13:39:05 +01:00
..
applications	chromium: Add dependency on pciutils for v25.	2012-11-20 04:55:45 +01:00
build-support	Support for low-impact updaters; some SF.net boilerplate helper.	2012-11-10 14:38:53 +04:00
data	man-pages: update to version 3.43	2012-11-05 11:42:05 +01:00
desktops	Add python-rsvg	2012-11-11 18:11:37 +01:00
development	Merge branch 'py/always-unzip' into python-merge	2012-11-22 13:39:05 +01:00
games	TBE: fix unneeded /bin/sh reference	2012-11-10 15:14:28 +04:00
lib	Typos	2012-11-14 11:38:47 +01:00
misc	Wine: update, add auto-update helper	2012-11-10 14:43:17 +04:00
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/pth-recursive' into python-merge	2012-11-22 13:37:51 +01:00