joachifm 76ad245b8e Merge pull request #14458 from magnetophon/japa ... japa: init at 0.8.4		2016-04-06 01:14:51 +02:00
..
applications	Merge pull request #14458 from magnetophon/japa	2016-04-06 01:14:51 +02:00
build-support	Merge commit 'bde820' from staging	2016-04-06 01:18:28 +03:00
data	tzdata: 2016b -> 2016c	2016-03-31 02:53:31 +02:00
desktops	Merge pull request #14370 from jgillich/patch-5	2016-04-01 18:04:20 +02:00
development	Merge pull request #14445 from costrouc/costrouc-openmpi	2016-04-06 00:54:16 +02:00
games	steam-run: add derivation	2016-04-03 16:10:14 +03:00
misc	hplip: canonicalise 56-hpmud.rules' paths if installed	2016-04-04 22:14:21 +02:00
os-specific	linux_testing: 4.6-rc1 -> 4.6-rc2	2016-04-03 19:14:31 +00:00
servers	mini-httpd: update to version 1.6	2016-04-04 15:06:32 +02:00
shells	Merge pull request #14343 from mayflower/upstream-zsh-zprofile	2016-04-01 14:44:38 +00:00
stdenv	Merge commit 'bde820' from staging	2016-04-06 01:18:28 +03:00
test	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
tools	Merge pull request #14449 from NeQuissimus/rsyslog8170	2016-04-05 19:32:43 +03:00
top-level	Merge pull request #14458 from magnetophon/japa	2016-04-06 01:14:51 +02:00