Andreas Rammhold 141644e752 conky: fix compilation with gcc-7		2017-11-25 15:57:40 +01:00
..
applications	kompose: init at 1.5.0 (#32026)	2017-11-25 14:24:52 +00:00
build-support	Merge branch 'staging' (older one)	2017-11-24 18:36:54 +01:00
common-updater
data	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-25 09:13:36 +01:00
desktops	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-25 09:13:36 +01:00
development	tracefilegen: 2015-11-14 -> 2017-05-13	2017-11-25 14:07:07 +01:00
games	Merge pull request #31994 from kierdavis/freesweep	2017-11-25 14:51:29 +00:00
misc	cnijfilter: add 4.00	2017-11-24 21:02:40 +01:00
os-specific	conky: fix compilation with gcc-7	2017-11-25 15:57:40 +01:00
servers	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-25 11:38:13 +01:00
shells	nix-bash-completions: 0.4 -> 0.5	2017-11-21 14:05:03 +01:00
stdenv	Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files	2017-11-22 15:23:37 -05:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	system-config-printer: fix python path	2017-11-25 12:24:23 +01:00
top-level	Merge pull request #31994 from kierdavis/freesweep	2017-11-25 14:51:29 +00:00