William A. Kennington III 767c179a94 Merge branch 'master' into staging		2015-03-26 14:44:05 -07:00
..
applications	Merge branch 'master' into staging	2015-03-26 14:44:05 -07:00
build-support	Merge branch 'master' into staging	2015-03-26 14:44:05 -07:00
data	Merge branch 'master' into staging	2015-03-26 14:44:05 -07:00
desktops	plasma52: update to plasma-5.2.2	2015-03-24 17:16:02 -05:00
development	Merge branch 'master' into staging	2015-03-26 14:44:05 -07:00
games	qt5: make qt-5.4.1 default	2015-03-24 17:14:56 -05:00
misc	cups: 1.7.5 -> 2.0.2	2015-03-26 13:30:54 -07:00
os-specific	Merge branch 'master' into staging	2015-03-26 14:44:05 -07:00
servers	Merge pull request #6940 from offlinehacker/pkgs/ripple-data-api/add	2015-03-26 20:04:51 +01:00
shells	Set some meta.platforms	2015-03-20 20:04:42 +01:00
stdenv	Merge branch 'master' into staging	2015-03-26 14:44:05 -07:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge branch 'master' into staging	2015-03-26 14:44:05 -07:00
top-level	Merge branch 'master' into staging	2015-03-26 14:44:05 -07:00