William A. Kennington III 7ccccc15ba Merge branch 'master' into staging		2015-03-27 16:03:03 -07:00
..
applications	Merge branch 'master' into staging	2015-03-27 16:03:03 -07:00
build-support	Merge branch 'master' into staging	2015-03-27 16:03:03 -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-27 16:03:03 -07:00
games	qt5: make qt-5.4.1 default	2015-03-24 17:14:56 -05:00
misc	Merge pull request #6994 from oxij/trivial-package-fixes	2015-03-27 11:09:16 +01:00
os-specific	Merge branch 'master' into staging	2015-03-27 16:03:03 -07:00
servers	prosody: 0.9.7 -> 0.9.8	2015-03-26 16:41:05 -07:00
shells	xonsh: new package	2015-03-26 14:25:17 -04:00
stdenv	Merge branch 'master' into staging	2015-03-27 16:03:03 -07:00
test
tools	Merge branch 'master' into staging	2015-03-27 16:03:03 -07:00
top-level	Merge branch 'master' into staging	2015-03-27 16:03:03 -07:00