Thomas Tuegel 2e255a2edd Merge branch 'staging'		2016-10-06 09:51:02 -05:00
..
applications	Merge pull request #19286 from peterhoeg/st_0148	2016-10-06 10:37:33 +02:00
build-support	Merge branch 'master' into staging	2016-10-05 19:02:48 +02:00
data	Merge branch 'staging'	2016-10-06 09:51:02 -05:00
desktops	kde5.plasma: 5.7.5 -> 5.8.0	2016-10-04 21:49:46 -05:00
development	Merge branch 'staging'	2016-10-06 09:51:02 -05:00
games	Merge pull request #19229 from samuelrivas/crafty	2016-10-06 10:04:17 +02:00
misc	vimPlugins: added agda-vim vim-grammarous vim-easytags, updates	2016-10-05 15:11:20 +02:00
os-specific	Merge branch 'staging'	2016-10-06 09:51:02 -05:00
servers	Kippo: move pythonPackages.twisted_11 to kippo expression	2016-10-06 12:59:05 +02:00
shells	Merge branch 'staging'	2016-10-06 09:51:02 -05:00
stdenv	Merge remote-tracking branch 'origin/master' into staging	2016-09-20 17:46:09 +02:00
test
tools	Merge branch 'staging'	2016-10-06 09:51:02 -05:00
top-level	Merge branch 'staging'	2016-10-06 09:51:02 -05:00