nixpkgs/pkgs/applications
Vladimír Čunát ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
..
audio Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
display-managers
editors Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
graphics Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
ike ike: add missing dependencies, note kernel compatibility 2013-12-30 22:19:16 +01:00
misc Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
networking Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
office gnucash: revert update from 2.4.15 to 2.6.0 2014-01-16 20:35:26 +01:00
science Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
search
taxes
version-management Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00
video ffmpeg: adding gnutls support 2014-01-15 17:04:14 +01:00
virtualization virt-manager: Fix running with --no-fork 2014-01-18 20:45:27 +00:00
window-managers i3status: update from 2.7 to 2.8 2014-01-13 17:28:42 +01:00