diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-10-27 19:58:03 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-10-27 19:58:03 +0300 |
| commit | 067d1cf33067a514489ed6d3953dd348dbdc2233 (patch) | |
| tree | 74dc49535964849be2168f56056439a121f55e85 /pkgs/development/libraries/libdrm/default.nix | |
| parent | 4b45aa784e2933ac89334622c969870bd0f87650 (diff) | |
| parent | f2b8262e053f6d2ab91cb9e5ead0496e3e4d3eab (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/science/math/sage/sage-src.nix
Diffstat (limited to 'pkgs/development/libraries/libdrm/default.nix')
0 files changed, 0 insertions, 0 deletions