Lluís Batlle i Rossell 22253677b3 Merging from trunk. The previous merge took the firefox 3.6 in a bad state. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=25202		2010-12-19 20:12:10 +00:00
..
activation-scripts	Updated Disnix packages and added disnixos	2010-12-17 18:42:02 +00:00
disnixos	Merging from trunk. The previous merge took the firefox 3.6 in a bad state.	2010-12-19 20:12:10 +00:00
DisnixWebService	Updated Disnix packages and added disnixos	2010-12-17 18:42:02 +00:00
default.nix	Updated Disnix packages and added disnixos	2010-12-17 18:42:02 +00:00