Vladimír Čunát d4e9fd2a90 Merge recent master into staging ... Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix		2014-08-21 15:09:31 +02:00
..
arduino
compilers	Merge recent master into staging	2014-08-21 15:09:31 +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 recent master into staging	2014-08-21 15:09:31 +02:00
libraries	Merge recent master into staging	2014-08-21 15:09:31 +02:00
lisp-modules
misc	intelgen4asm: Remove obsolete package	2014-08-07 01:32:43 +02:00
mobile	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
ocaml-modules	Merge master into PR	2014-08-12 21:52:20 +02:00
perl-modules	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
pharo/vm	Adding myself to the maintainers	2014-08-10 15:57:24 +02:00
python-modules	Merge #3152: add pyqt5	2014-08-12 20:33:34 +02: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 recent master into staging	2014-08-21 15:09:31 +02:00
web	Merge pull request #3513 from linquize/nodejs	2014-08-16 20:58:06 +02:00