nixpkgs-suyu/pkgs/os-specific/windows
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
..
mingw-headers
mingwrt svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
pthread-w32 Add pthreads-w32. 2012-01-30 09:53:45 +00:00
w32api svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
wxMSW-2.8