Thomas Tuegel 88918e10e9 Merge branch 'master' into staging		2015-04-10 07:45:38 -05:00
..
applications	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00
build-support	Merge branch master into staging	2015-04-06 18:58:08 -07:00
data	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00
desktops	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00
development	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00
games	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00
misc	xlockmore: update from 5.45 to 5.46	2015-04-09 16:22:30 +02:00
os-specific	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00
servers	prosody: add dependency on zlib (close #6894)	2015-04-09 18:40:20 +02:00
shells
stdenv	Merge branch 'master' into staging	2015-03-27 16:03:03 -07:00
test
tools	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00
top-level	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00