summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-06-10 20:00:44 +0200
committerVladimír Čunát <v@cunat.cz>2020-06-10 20:00:44 +0200
commit13add13388cde09f5f60c598123c8d3f64244f50 (patch)
tree953bc63b7ae1dd8371da0c2a88f89e05ca6d802f /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch
parent34d58cb8396b5e031abe4ffbb1b30da8549bf79d (diff)
parenta6941d2b2adc66d10ebfa4058fa481e735ee2916 (diff)
Merge branch 'master' into staging-next
... to resolve a trivial conflict in libpcap.
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions