Eelco Dolstra f1a63ee0a7 * Hack svn:mergeinfo to hopefully allow "svn merge --reintegrate" ... to succeed. The error is: $ svn merge --reintegrate ^/nixpkgs/branches/stdenv-updates svn: E195016: Reintegrate can only be used if revisions 33530 through 34045 were previously merged from https://nixos.org/repos/nix/nixpkgs/trunk to the reintegrate source, but this is not the case: nixpkgs/branches/stdenv-updates/pkgs/misc/screensavers/xscreensaver/default.nix Missing ranges: /nixpkgs/trunk/pkgs/misc/screensavers/xscreensaver/default.nix:33655-33656 svn path=/nixpkgs/branches/stdenv-updates/; revision=34046		2012-05-10 14:56:19 +00:00
doc	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
maintainers	svn path=/nixpkgs/trunk/; revision=32961	2012-03-09 17:53:04 +00:00
pkgs	* Final sync with the trunk.	2012-05-10 14:41:16 +00:00
COPYING	* Applying an MIT-style license to Nixpkgs.	2006-04-25 16:50:34 +00:00
default.nix	* For convenience, provide a top-level Nix expression that simply	2007-04-26 14:32:57 +00:00
VERSION	* Bump the version.	2010-02-08 09:23:03 +00:00