Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
fish	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
otr	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
default.nix	irssi: fix build on darwin	2013-06-20 09:25:54 +10:00