Vladimír Čunát 5a98b9f514 Merge recent master into p/stdenv ... Merged just before the pypi update, as it seems to cause problems on Hydra.		2014-06-09 19:07:31 +02:00
..
applications	Merge recent master into p/stdenv	2014-06-09 19:07:31 +02:00
build-support	Merge pull request #2767 from jwiegley/hscolour	2014-06-03 10:50:04 +02:00
data	Merge pull request #2741 from bergey/nafees	2014-05-28 08:37:29 +02:00
desktops	nautilus-sendto: add to gnome 3.10	2014-05-29 12:38:50 +02:00
development	Merge recent master into p/stdenv	2014-06-09 19:07:31 +02:00
games	openra: runtime dependency on systemd	2014-06-08 19:55:38 +02:00
misc	Merge recent master into p/stdenv	2014-06-09 19:07:31 +02:00
os-specific	Merge recent master into p/stdenv	2014-06-09 19:07:31 +02:00
servers	spamassassin: download from any Apache mirror	2014-06-06 14:08:41 +02:00
shells
stdenv	Merge recent master into p/stdenv	2014-06-09 19:07:31 +02:00
test
tools	Merge recent master into p/stdenv	2014-06-09 19:07:31 +02:00
top-level	Merge recent master into p/stdenv	2014-06-09 19:07:31 +02:00