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	ecj: Build on Darwin	2014-07-15 11:51:27 +02:00
guile-modules	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
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	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00
misc	intelgen4asm: Remove obsolete package	2014-08-07 01:32:43 +02:00
mobile	Some additional android runtimes.	2014-08-23 11:03:29 +02:00
ocaml-modules	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
perl-modules	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
pharo/vm	Adding myself to the maintainers	2014-08-10 15:57:24 +02:00
python-modules	Merge pull request #3316 from aherrmann/pr_mpi	2014-08-29 01:22:02 +04:00
qtcreator	qtcreator: install desktop file	2014-08-02 21:11:36 +02:00
r-modules	RcmdrPlugin_ROC: remove broken package	2014-08-15 18:51:47 +02:00
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