Florian Friesdorf 92a833604c Merge branch 'py/offline-distutils' into python-merge ... Conflicts: pkgs/development/python-modules/generic/builder.sh pkgs/development/python-modules/generic/default.nix		2012-11-24 22:49:19 +01:00
..
applications	gocr: fix path to 'wish' in gocr.tcl	2012-11-23 22:22:52 +01:00
build-support
data
desktops	Add python-rsvg	2012-11-11 18:11:37 +01:00
development	Merge branch 'py/offline-distutils' into python-merge	2012-11-24 22:49:19 +01:00
games
lib	Merge pull request #190 from MarcWeber/fixes/lists-sort	2012-11-21 21:34:42 -08:00
misc	sane-backends: update snapshot to version: 1.0.22.git20121123	2012-11-23 21:31:23 +01:00
os-specific	nvidia-x11: Update to 310.19	2012-11-23 11:11:01 +01:00
servers	Merge pull request #153 from jcumming/icecast	2012-11-21 21:30:28 -08:00
shells
stdenv
test
tools	Add rng-tools	2012-11-22 01:05:45 -05:00
top-level	Merge branch 'channel-nixos' into python-merge	2012-11-24 22:48:30 +01:00