Mathijs Kwik 609f8dc04b Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/top-level/all-packages.nix		2013-11-01 08:31:54 +01:00
..
audio	Merge branch 'master' into stdenv-updates	2013-11-01 08:31:54 +01:00
display-managers	slim: Work around broken PAM session handling	2013-10-15 13:23:40 +02:00
editors	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
graphics	Merge branch 'origin/master' into stdenv-updates.	2013-10-27 10:58:24 +01:00
ike	add ike: IPSec client	2013-10-18 18:50:53 +02:00
misc	Merge branch 'master' into stdenv-updates	2013-11-01 08:31:54 +01:00
networking	Merge branch 'master' into stdenv-updates	2013-11-01 08:31:54 +01:00
office	Eventlist: Renamed accordingly and fixed the description.	2013-10-07 00:26:27 +02:00
science	Updating EProver to 1.8	2013-10-20 21:03:04 +04:00
search
taxes
version-management	Merge branch 'master' into stdenv-updates	2013-11-01 08:31:54 +01:00
video	miro: New package, version 6.0.	2013-10-28 20:48:50 +01:00
virtualization	virt-manager: add vte as build input, so console works for lxc	2013-10-19 18:07:14 +02:00
window-managers	Updating Compiz	2013-10-20 21:06:48 +04:00