diff options
| author | Shea Levy <shea@shealevy.com> | 2013-02-21 11:13:30 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-02-21 11:13:30 -0500 |
| commit | acd4299e75a167a79521d76a1d312ca1cd8df92e (patch) | |
| tree | 4afeb7749025dabe55f3aa8f18a397384daa6595 /doc/quote-literals.xsl | |
| parent | aacca1902cbb7117d978199323cf7bc1ffa4ee97 (diff) | |
| parent | 9cff61881d7391c92000eb83f94b515f763edbf9 (diff) | |
| download | nixlib-acd4299e75a167a79521d76a1d312ca1cd8df92e.tar nixlib-acd4299e75a167a79521d76a1d312ca1cd8df92e.tar.gz nixlib-acd4299e75a167a79521d76a1d312ca1cd8df92e.tar.bz2 nixlib-acd4299e75a167a79521d76a1d312ca1cd8df92e.tar.lz nixlib-acd4299e75a167a79521d76a1d312ca1cd8df92e.tar.xz nixlib-acd4299e75a167a79521d76a1d312ca1cd8df92e.tar.zst nixlib-acd4299e75a167a79521d76a1d312ca1cd8df92e.zip | |
Merge branch 'master' into stdenv-updates
Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
Diffstat (limited to 'doc/quote-literals.xsl')
0 files changed, 0 insertions, 0 deletions