Vladimír Čunát 9443129b08 Merge master into stdenv-updates ... Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)		2014-01-04 18:34:53 +01:00
..
audio	Merge master into stdenv-updates	2014-01-04 18:34:53 +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-04 18:34:53 +01:00
graphics	Merge master into stdenv-updates	2014-01-04 18:34:53 +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-04 18:34:53 +01:00
networking	Merge master into stdenv-updates	2014-01-04 18:34:53 +01:00
office	gnumeric: add platforms, maintainer	2013-12-28 15:49:19 +01:00
science	Whitespace fixes in package expressions I maintain	2014-01-02 17:58:08 +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-04 18:34:53 +01:00
video	vlc: Update from 2.1.1 -> 2.1.2	2013-12-29 21:35:01 +01:00
virtualization	Minor changes to Bochs expression.	2013-11-24 16:30:16 +01:00
window-managers	Merge pull request #1410 from ktosiek/pr/compton	2013-12-29 07:01:53 -08:00