Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk ... Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863		2012-01-26 15:27:03 +00:00
..
fast-export	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
git	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
git-annex	git-annex: updated to version 3.20120123	2012-01-25 16:07:52 +00:00
git-subtree	git-subtree: updated to version 0.4-2-g2793ee6	2011-09-18 14:56:46 +00:00
git2cl	git2cl: added meta data for the package and updated the build to take	2011-08-23 08:44:59 +00:00
qgit
stgit	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
svn2git	* Proper version number.	2011-12-06 21:16:20 +00:00
topgit	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
default.nix	git-annex: updated to version 3.20111231	2012-01-02 14:51:26 +00:00