diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
commit | 215a07c1a9d6d208c1ba0037eccaaba7de9d6b68 (patch) | |
tree | f31e835b16c30957eb4ae3710cbfa922e8a64fbd /pkgs/tools/X11/x2x | |
parent | b31c67e24d56c90a6732d3a310ff13684b73e200 (diff) | |
parent | 4e3dcd925499547314567107366cae26a99c4ef7 (diff) | |
download | nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.gz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.bz2 nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.lz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.xz nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.zst nixpkgs-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.zip |
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
Diffstat (limited to 'pkgs/tools/X11/x2x')
0 files changed, 0 insertions, 0 deletions