diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-24 06:29:09 +0000 |
| commit | bde20f3e881049c9d019eb34c07d6194b20b0042 (patch) | |
| tree | f24782e55ca68a214d0fe7585097d97a6aa687dd /pkgs/development/python-modules/rangehttpserver | |
| parent | 6a29a56c1277d80aa65e063f34a179c847e6d8b4 (diff) | |
| parent | 50d66b945ee5aceae2bbf2eb791487e18ac9d374 (diff) | |
Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions