Tim Steinbach a74e13f057 Merge pull request #33976 from taku0/oraclejdk-8u161 ... oraclejdk: 8u151, 8u152, 9.0.1 -> 8u161, 8u162, 9.0.4 [Critical security fixes]		2018-01-17 13:56:52 +00:00
..
applications	mily: use libclang	2018-01-17 15:53:08 +02:00
build-support	Merge remote-tracking branch 'upstream/master' into staging	2018-01-14 21:18:27 +02:00
common-updater
data	Merge commit '2e56ba' from staging into master	2018-01-17 12:50:46 +02:00
desktops	Merge commit '2e56ba' from staging into master	2018-01-17 12:50:46 +02:00
development	Merge pull request #33976 from taku0/oraclejdk-8u161	2018-01-17 13:56:52 +00:00
games	Merge pull request #33846 from dtzWill/update/2048-in-terminal	2018-01-17 12:25:27 +00:00
misc	elk: 5.6.5 -> 5.6.6	2018-01-17 02:11:19 +01:00
os-specific	Merge commit '2e56ba' from staging into master	2018-01-17 12:50:46 +02:00
servers	Merge commit '2e56ba' from staging into master	2018-01-17 12:50:46 +02:00
shells	Remove nckx as a maintainer for all packages	2018-01-16 23:00:49 +01:00
stdenv	Merge branch 'ericson2314-cross-master' into staging	2018-01-16 13:05:39 -05:00
test
tools	Merge commit '2e56ba' from staging into master	2018-01-17 12:50:46 +02:00
top-level	Merge commit '2e56ba' from staging into master	2018-01-17 12:50:46 +02:00