William A. Kennington III cdd93463c0 gawk: 4.1.2 -> 4.1.3		2015-05-24 00:19:35 -07:00
..
applications	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
build-support	Merge pull request #6411 from NixOS/passAsFile	2015-05-14 13:57:24 +02:00
data	man-pages 3.83 -> 4.00	2015-05-10 13:46:02 +02:00
desktops	kde4.kopete: fix build	2015-05-07 21:49:54 -05:00
development	ncurses: Always symlink to a real .so and add symlinks for major versions	2015-05-22 15:31:53 -07:00
games	Update LiquidWar	2015-05-10 13:46:31 +02:00
misc	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
os-specific	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
servers	Update Nginx	2015-05-10 13:46:30 +02:00
shells	pythonPackages.ipython: 2.3.1 -> 3.1.0	2015-05-02 22:05:07 +02:00
stdenv	Merge pull request #7740 from dezgeg/arm	2015-05-07 20:53:07 +02:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	gawk: 4.1.2 -> 4.1.3	2015-05-24 00:19:35 -07:00
top-level	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00