Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/stdenv/generic/default.nix		2014-11-06 10:16:39 +01:00
..
arduino
compilers	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
coq-modules
eclipse	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
guile-modules
interpreters	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
libraries	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
lisp-modules	Merge recent master into staging	2014-11-05 15:00:44 +01:00
lua-modules
misc
mobile
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
perl-modules	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
pharo
pure-modules/pure-gsl
python-modules	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
qtcreator
r-modules	r-RcmdrPlugin.ROC: disable broken build	2014-11-02 17:09:54 +01:00
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
web