Vladimír Čunát 3a2478605d Merge 'master' into staging		2014-12-24 16:06:12 +01:00
..
applications	ncmpcpp: 0.6.1 -> 0.6.2	2014-12-23 22:44:33 +01:00
build-support	autoreconf may need gettext	2014-12-22 20:20:00 +00:00
data	include version number in name	2014-12-20 14:45:26 +00:00
desktops	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
development	Add GHC 7.8.4 and create haskellPackages_ghc784 package set.	2014-12-23 20:44:49 +01:00
games	openttd: Fix build with fix from upstream.	2014-12-22 17:29:30 +01:00
misc	Merge pull request #5428 from bdimcheff/fix-cups-filter-bash	2014-12-23 21:05:10 +01:00
os-specific	Merge 'master' into staging	2014-12-24 16:06:12 +01:00
servers	Add newrelic-sysmond	2014-12-22 15:13:08 -05:00
shells	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
stdenv	Use updated bootstrap binaries	2014-12-18 15:04:40 +01:00
test
tools	safe-rm: 0.11 -> 0.12	2014-12-23 22:32:49 +01:00
top-level	nvidia_x11: add 343 branch as the default (close #5070)	2014-12-24 00:06:46 +01:00