Vladimír Čunát 476c96b5c6 Merge master into staging ... Taken the version from recent channel bump, as it's well-tested. Close #11460.		2015-12-05 10:26:06 +01:00
..
applications	Merge master into staging	2015-12-05 10:26:06 +01:00
build-support	Merge master into staging	2015-12-05 10:26:06 +01:00
data	Merge pull request #11350 from magnetophon/dina-font-master	2015-12-01 23:00:34 +03:00
desktops	html-tidy: unify with its drop-in replacement tidy-html5	2015-11-29 10:32:02 +01:00
development	Merge master into staging	2015-12-05 10:26:06 +01:00
games	Convert some *Flags from strings to lists	2015-11-26 23:45:31 +01:00
misc	Merge pull request #11379 from bendlas/update-cdemu	2015-12-02 22:46:42 +03:00
os-specific	Merge master into staging	2015-12-05 10:26:06 +01:00
servers	Merge master into staging	2015-12-05 10:26:06 +01:00
shells	Merge master into staging	2015-12-05 10:26:06 +01:00
stdenv	Merge master into staging	2015-12-05 10:26:06 +01:00
test
tools	Merge master into staging	2015-12-05 10:26:06 +01:00
top-level	Merge master into staging	2015-12-05 10:26:06 +01:00