diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-06-15 11:19:41 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-06-15 11:19:41 +0200 |
| commit | 91171e295574bd7721cafeaf4200c807952275a7 (patch) | |
| tree | 1ae75ec1cb3b0fca7bf6bab29071e0f67cbe404d /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | f2ba460019c8ceb7af3967520f98a6836e759217 (diff) | |
| parent | 4b7c8d538e1aed2bc30b6e7eb1cbd96063ad4132 (diff) | |
Merge branch 'master' into staging-next
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions