Author: viric
Date: Sun Oct 10 11:55:05 2010
New Revision: 24203
URL: https://svn.nixos.org/websvn/nix/?rev=24203&sc=1

Log:
I had did a merge from trunk when nixos trunk was broken. Remerging after the
trunk fix.

Modified:
   nixos/branches/stdenv-updates/   (props changed)
   nixos/branches/stdenv-updates/modules/module-list.nix

Modified: nixos/branches/stdenv-updates/modules/module-list.nix
==============================================================================
--- nixos/branches/stdenv-updates/modules/module-list.nix       Sun Oct 10 
11:50:50 2010        (r24202)
+++ nixos/branches/stdenv-updates/modules/module-list.nix       Sun Oct 10 
11:55:05 2010        (r24203)
@@ -14,7 +14,6 @@
   ./config/users-groups.nix
   ./hardware/network/intel-2200bg.nix
   ./hardware/network/intel-3945abg.nix
-  ./hardware/network/rt2870.nix 
   ./hardware/network/rt73.nix 
   ./hardware/pcmcia.nix
   ./installer/generations-dir/generations-dir.nix
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to