Eelco Dolstra 929b7bdc4b Merge remote-tracking branch 'origin/master' into glibc-2.18 ... Conflicts: pkgs/development/libraries/glibc/2.17/locales.nix		2013-12-03 09:22:24 -05:00
..
applications	ess-mode: update to version 13.09	2013-12-03 12:44:52 +01:00
build-support	Fix nix-prefetch-git	2013-11-24 14:03:34 +01:00
data	Merge pull request #1289 from iyzsong/terminus-font	2013-11-28 02:52:12 -08:00
desktops	Remove caches from liferea, evince and network-manager-applet	2013-12-01 20:26:31 +01:00
development	Merge remote-tracking branch 'origin/master' into glibc-2.18	2013-12-03 09:22:24 -05:00
games	haskell-LambdaHack: update to version 0.2.10	2013-12-02 16:26:24 +01:00
misc	Update unstable Wine to 1.7.7	2013-11-25 10:59:38 +04:00
os-specific	Adding libnl 3.2.19 to use instead of the latest with ntrack	2013-12-02 22:47:52 +04:00
servers	nagios-plugins: fix download URL (no longer available from sourceforge)	2013-12-03 11:28:27 +01:00
shells	fish: Update to 2.1.0 (close #1261)	2013-11-23 11:09:09 +01:00
stdenv	mkDerivation: Set meta.position to the source file of the derivation	2013-11-19 14:58:47 +01:00
test
tools	opensc: update to version 0.13.0	2013-12-02 12:37:24 +01:00
top-level	Merge remote-tracking branch 'origin/master' into glibc-2.18	2013-12-03 09:22:24 -05:00