diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-03-14 00:49:22 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-03-14 00:49:22 +0200 |
| commit | aba0b45b86fa5d3bf47bca33c37f3f0211b7e052 (patch) | |
| tree | 9ec0dfef6dd6253dd329d5eb85da6a52a1470238 /nixos/maintainers | |
| parent | 8bfa9f528c88243578246798c7c2ddde045e0de0 (diff) | |
| parent | 46c9eac980e1d879d62c25499544c402feff3066 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
Diffstat (limited to 'nixos/maintainers')
0 files changed, 0 insertions, 0 deletions