diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
| commit | 5b132f6e96a9794018ae1c085da482b381d1e039 (patch) | |
| tree | ff54ae514799540c093adcfeca0d501b75cde506 /doc | |
| parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
| parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) | |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions