philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs/applications
History
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
..
audio svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
display-managers/slim
editors svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
graphics svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
misc svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
networking svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
office svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
science svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
taxes * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
version-management svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
video svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
virtualization * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
window-managers svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00