Carles Pagès 6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland ... Conflicts: pkgs/development/libraries/mesa/default.nix pkgs/top-level/all-packages.nix		2013-03-10 18:19:49 +01:00
..
arduino
compilers	SBCL: patch for new Glibc no longer needed	2013-03-08 17:55:11 +04:00
eclipse
guile-modules
interpreters	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
libraries	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-03-10 18:19:49 +01:00
misc
mobile	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
ocaml-modules
perl-modules	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
python-modules	add older pycrypto25	2013-03-09 10:24:38 +01:00
qtcreator
ruby-modules
tools	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
web	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00