diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-01-24 12:21:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-01-24 12:22:38 +0100 |
| commit | 411405c9f64a74ad124593f17897843ed32c9823 (patch) | |
| tree | d6e3a4a3931012b420a1a6b735aec9a196767c3f /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | 727e365f0276012d719f0e6c95ba0f0a53c9099a (diff) | |
| parent | 353e2d957c7421cae4e3ab42739a0997ea7e310f (diff) | |
Merge branch 'master' into staging-next
Trivial conflict in release notes, except that the xml/docbook parts
are horrible for (semi-)automatic conflict resolution.
Fortunately that's generated anyway.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions