philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk 
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
..
applications svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
build-support svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
data
desktops svn merge ^/nixpkgs/trunk 2012-01-27 16:43:39 +00:00
development svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
games svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
lib svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
misc svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
os-specific svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
servers svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
shells
stdenv svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
test
tools svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00
top-level svn merge ^/nixpkgs/trunk 2012-02-10 10:24:30 +00:00