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

..

androidenv

android-sdk: Add another exec

2012-11-14 11:38:28 +01:00

compilers

gcc 4.7: remove attempt to modify non-existent file

2012-11-17 20:54:29 +01:00

eclipse

…

guile-modules

…

interpreters

Merge branch 'py/pdb' into python-merge

2012-11-22 13:38:08 +01:00

libraries

haskell-hledger: update to version 0.19.1

2012-11-17 11:39:25 +01:00

misc

…

ocaml-modules

…

perl-modules

…

python-modules

Merge branch 'py/offline-distutils' into python-merge

2012-11-23 17:28:51 +01:00

ruby-modules

…

tools

neoload: fix evaluation of tarball job

2012-11-18 18:35:01 +01:00

web

…