nixpkgs/pkgs/applications
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
..
audio Merge master into stdenv-updates 2014-01-18 14:46:20 +01:00
display-managers slim: Work around broken PAM session handling 2013-10-15 13:23:40 +02:00
editors Merge master into stdenv-updates 2014-01-18 14:46:20 +01:00
graphics Merge master into stdenv-updates 2014-01-18 14:46:20 +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-18 14:46:20 +01:00
networking Merge master into stdenv-updates 2014-01-18 14:46:20 +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-18 14:46:20 +01:00
search Adding doodle. 2013-04-22 20:57:14 +04:00
taxes aangifte2012: preload library which seems needed 2013-04-05 00:34:14 +02:00
version-management Merge master into stdenv-updates 2014-01-18 14:46:20 +01:00
video ffmpeg: adding gnutls support 2014-01-15 17:04:14 +01:00
virtualization virt-manager: Add graphical support for the Spice protocol 2014-01-11 22:01:52 +01:00
window-managers i3status: update from 2.7 to 2.8 2014-01-13 17:28:42 +01:00