Author: urkud
Date: Wed Oct  5 10:05:46 2011
New Revision: 29654
URL: https://ssl.nixos.org/websvn/nix/?rev=29654&sc=1

Log:
svn merge trunk

Modified:
   nixpkgs/branches/drop-kde4.5/   (props changed)
   
nixpkgs/branches/drop-kde4.5/pkgs/applications/graphics/xscreensaver/default.nix
   (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/applications/misc/xneur/0.8.nix   (props 
changed)
   nixpkgs/branches/drop-kde4.5/pkgs/applications/networking/browsers/icecat-4/ 
  (props changed)
   
nixpkgs/branches/drop-kde4.5/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
   (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/build-support/gcc-wrapper/   (props 
changed)
   nixpkgs/branches/drop-kde4.5/pkgs/build-support/release/debian-build.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/build-support/release/nix-build.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/build-support/release/rpm-build.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/build-support/release/source-tarball.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ghc/6.10.1.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ghc/6.10.2.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ghc/6.8.2.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/compilers/ghc/6.8.3.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/aterm/2.8.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/fltk/fltk11.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/glibc-2.9/   (props 
changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/goocanvas/   (props 
changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/pcre/default.nix   
(props changed)
   
nixpkgs/branches/drop-kde4.5/pkgs/development/libraries/readline/readline6.nix  
 (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/tools/misc/autoconf/2.13.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/development/tools/misc/gnum4/default.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/misc/tex/pgf/1.x.nix   (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/misc/tex/pgf/2.x.nix   (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/atheros/r3867.nix   
(props changed)
   
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel-headers/2.6.28.nix   
(props changed)
   
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel-headers/2.6.32.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/generic.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.25.nix  
 (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.27.nix  
 (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.28.nix  
 (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.29.nix  
 (props changed)
   
nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix 
  (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.32.nix  
 (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kernel/linux-2.6.33.nix  
 (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/qemu-kvm/default.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/os-specific/linux/util-linux-ng/   (props 
changed)
   nixpkgs/branches/drop-kde4.5/pkgs/servers/mail/dovecot/1.1.1.nix   (props 
changed)
   nixpkgs/branches/drop-kde4.5/pkgs/shells/bash/4.1.nix   (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/shells/bash/4.2.nix   (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/stdenv/generic/setup.sh   (props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/stdenv/linux/make-bootstrap-tools.nix   
(props changed)
   nixpkgs/branches/drop-kde4.5/pkgs/tools/networking/wget/default.nix   (props 
changed)
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to