Peter Simons 2af20dbacf Merge pull request #3088 from aycanirican/master ... jailbreak pipes-aeson which depends on pipes-bytestring == 2.0.* which i...		2014-06-30 15:55:33 +02:00
..
applications	Merge pull request #3118 from NixOS/libreoffice-update-4.2.5	2014-06-30 17:39:12 +04:00
build-support	Merge pull request #2871 from auntieNeo/kochi-substitute	2014-06-30 10:14:14 +04:00
data	Merge pull request #3102 from auntieNeo/ipafont	2014-06-30 10:19:48 +04:00
desktops	libcroco: weaken platform requirement for building on darwin	2014-06-25 11:14:35 -07:00
development	Merge pull request #3088 from aycanirican/master	2014-06-30 15:55:33 +02:00
games	Merge pull request #3020 from ambrop72/0ad	2014-06-30 10:30:41 +04:00
misc	winetricks: Update to 1199	2014-06-25 00:51:41 +02:00
os-specific	Update linux_testing and enable parallel build of Linux kernel	2014-06-30 10:52:33 +04:00
servers	Adding a minimal script set to serve store as a dynamical binary cache	2014-06-30 00:39:54 +04:00
shells	zsh: improve description	2014-06-23 13:07:28 +02:00
stdenv
test
tools	Update gummiboot to the latest	2014-06-30 11:05:40 +04:00
top-level	Merge pull request #3118 from NixOS/libreoffice-update-4.2.5	2014-06-30 17:39:12 +04:00