Vladimír Čunát 9443129b08 Merge master into stdenv-updates ... Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)		2014-01-04 18:34:53 +01:00
..
arduino
compilers	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00
eclipse
guile-modules
interpreters	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00
libraries	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00
lisp-modules
misc
mobile
ocaml-modules
perl-modules
python-modules	setuptools: 0.9.8 -> 2.0.2	2013-12-29 19:15:36 +01:00
qtcreator
r-modules/generic
ruby-modules
tools	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00
web