Vladimír Čunát e51f73652d Merge recent master into staging ...

Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)

2014-08-30 10:04:02 +02:00

..

arduino

ino: set six as dep

2014-08-27 19:02:05 +02:00

compilers

Merge recent master into staging

2014-08-30 10:04:02 +02:00

eclipse

…

guile-modules

…

interpreters

Merge recent master into staging

2014-08-30 10:04:02 +02:00

libraries

Merge recent master into staging

2014-08-30 10:04:02 +02:00

lisp-modules

…

misc

…

mobile

Some additional android runtimes.

2014-08-23 11:03:29 +02:00

ocaml-modules

Merge pull request #3632 from vbgl/ocaml-csv

2014-08-23 13:04:52 +04: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

RcmdrPlugin_ROC: remove broken package

2014-08-15 18:51:47 +02:00

ruby-modules

…

tools

Merge recent master into staging

2014-08-30 10:04:02 +02:00

web

Merge pull request #3337 from tailhook/node_permission_error

2014-08-23 12:38:35 +04:00