diff options
| author | Peter Simons <simons@cryp.to> | 2013-07-30 11:29:30 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-07-30 11:29:30 +0200 |
| commit | 522acfd2f46c86afc651dc25e420c9cd2a86dd09 (patch) | |
| tree | be0784af7ec066c19a7d7a6804fb90e97d34e1ac /pkgs/desktops/kde-4.10/kdesdk | |
| parent | 0b8f1b1448539d4166573769931de48488af7a4c (diff) | |
| parent | af98eb8de0e06b86a07d8267fb52b4d07b65d5b9 (diff) | |
| download | nixpkgs-522acfd2f46c86afc651dc25e420c9cd2a86dd09.tar nixpkgs-522acfd2f46c86afc651dc25e420c9cd2a86dd09.tar.gz nixpkgs-522acfd2f46c86afc651dc25e420c9cd2a86dd09.tar.bz2 nixpkgs-522acfd2f46c86afc651dc25e420c9cd2a86dd09.tar.lz nixpkgs-522acfd2f46c86afc651dc25e420c9cd2a86dd09.tar.xz nixpkgs-522acfd2f46c86afc651dc25e420c9cd2a86dd09.tar.zst nixpkgs-522acfd2f46c86afc651dc25e420c9cd2a86dd09.zip | |
Merge remote-tracking branch 'master' into stdenv-updates.
Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/desktops/kde-4.10/kdesdk')
0 files changed, 0 insertions, 0 deletions