Jörg Thalheim 79c7ce8d85 Merge pull request #45729 from Enzime/update/compton-git ... compton, compton-git: Merge derivations and update version		2018-08-29 09:07:09 +01:00
..
applications	compton, compton-git: Merge derivations	2018-08-29 12:47:35 +10:00
build-support	Merge pull request #26416 from lverns/make-genericName-optional	2018-08-27 19:29:13 -04:00
common-updater
data	Merge pull request #45556 from r-ryantm/auto-update/media-player-info	2018-08-27 21:54:28 +01:00
desktops	mate.eom: 1.21.0 -> 1.21.2 (#45597)	2018-08-27 15:59:04 +02:00
development	Merge pull request #45721 from Mic92/remove-hurd	2018-08-28 23:32:39 +01:00
games	vitetris: init at 0.57.2 (#45672)	2018-08-27 20:30:18 +02:00
misc	Merge branch 'master' into es6	2018-08-23 23:41:27 +02:00
os-specific	cifs-utils: also generate manpages	2018-08-29 14:32:57 +08:00
servers	nagios: 4.4.1 -> 4.4.2 (#45558)	2018-08-28 13:53:51 +02:00
shells	Merge branch 'staging-next' into staging	2018-08-13 20:57:50 +02:00
stdenv	hurd: cleanup unmaintained target	2018-08-28 22:18:02 +01:00
test	pkgs/tests: Add test for LD_LIBRARY_PATH	2018-08-01 19:02:21 +03:00
tools	Merge pull request #45721 from Mic92/remove-hurd	2018-08-28 23:32:39 +01:00
top-level	compton, compton-git: Merge derivations	2018-08-29 12:47:35 +10:00