diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-03 12:45:23 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-03 12:45:23 +0100 |
| commit | 64e19fdedae3abd589c0429da7e6ec4918d83e8b (patch) | |
| tree | a8ee900cd9b3e0c6413b414dd60c77fbd066ae36 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | ea3935a6c418b076ed41dd1d661c2e1e06656bde (diff) | |
| parent | 7f4b26681ded35a0e6cb6a90d3bf013c7f4c182d (diff) | |
Merge staging into staging-next
Merging staging into staging-next even though we haven't merged staging-next into master yet.
The motivation for this merge is that it's been a while since we merged into master causing
the 3 branches to diverge too much.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions