Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular ... Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix		2014-08-31 12:23:18 +02:00
..
arduino	ino: set six as dep	2014-08-27 19:02:05 +02:00
compilers	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
eclipse
guile-modules
interpreters	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
libraries	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
lisp-modules
misc
mobile
ocaml-modules	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
perl-modules
pharo/vm
python-modules	Merge pull request #3316 from aherrmann/pr_mpi	2014-08-29 01:22:02 +04:00
qtcreator
r-modules
ruby-modules
tools	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
web	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00