diff options
| author | Peter Simons <simons@cryp.to> | 2015-03-10 12:09:43 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-03-10 12:09:43 +0100 |
| commit | 6694ef42a9aba02a16dba72378a73122cbbafc75 (patch) | |
| tree | 9473bd4d1e3ebaee30e7e689ba7dd4ddaf849513 /pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch | |
| parent | de892761cf10a161663fbf97c80f17281ed5e65f (diff) | |
| parent | 8196130a1d922f24e77026d88859b824b15e40ba (diff) | |
Merge branch 'master' into staging.
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix
pkgs/tools/security/gnupg/21.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch')
0 files changed, 0 insertions, 0 deletions