Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/boost/generic.nix		2014-11-11 23:48:08 +01:00
..
arduino
compilers	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
coq-modules
eclipse
guile-modules
interpreters	Merge branch 'master' into staging	2014-11-10 10:03:52 +01:00
libraries	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
lisp-modules	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
lua-modules
misc
mobile
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
perl-modules
pharo
pure-modules/pure-gsl
python-modules
qtcreator
r-modules
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
web	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00