Vladimír Čunát b4af993c3f Merge branch 'master' into staging ... Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh		2014-11-14 14:28:23 +01:00
..
arduino
compilers	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
coq-modules	coqPackages.unimath: new expression	2014-11-12 14:37:25 -06:00
eclipse
guile-modules
interpreters	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
libraries	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
lisp-modules	Merge branch 'master' into staging	2014-11-14 14:28:23 +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	buildPythonPackage: add python to propagatedBuildInputs	2014-11-13 21:04:13 +01:00
qtcreator
r-modules
ruby-modules
tools	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
web	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00