Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/tools/misc/less/default.nix		2013-12-16 21:13:24 +01:00
..
audio	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
display-managers	slim: Work around broken PAM session handling	2013-10-15 13:23:40 +02:00
editors	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
graphics	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
ike	add ike: IPSec client	2013-10-18 18:50:53 +02:00
misc	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
networking	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
office	haskell-hledger-irr: update to version 0.1.1.3	2013-12-14 22:08:27 +01:00
science	archimedes: update from 2.0.0 to 2.0.1	2013-12-15 11:25:56 +02:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes
version-management	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
video	It is a first try to an expression for MPV video player.	2013-12-14 20:47:05 +01:00
virtualization	Minor changes to Bochs expression.	2013-11-24 16:30:16 +01:00
window-managers	windowmaker: update from 0.95.4 to 0.95.5	2013-12-16 01:36:17 +02:00