Vladimír Čunát 30f31c9afc Merge 'master' into staging ... (relatively simple conflicts)		2015-04-26 22:52:08 +02:00
..
applications	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
build-support	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
data	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
desktops	GNOME 3.16.1, closes #7357	2015-04-25 12:02:33 +02:00
development	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
games	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
misc	Merge pull request #7389 from AndersonTorres/atari++	2015-04-26 10:05:14 +02:00
os-specific	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
servers	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
shells	meta.licenses -> license	2015-04-21 23:10:07 +02:00
stdenv	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
test
tools	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
top-level	Merge 'master' into staging	2015-04-26 22:52:08 +02:00