diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-02 00:54:06 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-01-02 00:54:17 +0100 |
| commit | 5a67b130b9b4d72a4398b8f0cd4893674213fb20 (patch) | |
| tree | 81354bb3b5c2447bda9e93dbc94acdbc4d913c25 /COPYING | |
| parent | 2bb33130cc3a00a8fb1a6afb341cf31079061e5a (diff) | |
| parent | 2c288548b93b657365c27a0132a43ba0080870cc (diff) | |
| download | nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.gz nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.bz2 nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.lz nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.xz nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.zst nixpkgs-5a67b130b9b4d72a4398b8f0cd4893674213fb20.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'COPYING')
| -rw-r--r-- | COPYING | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/COPYING b/COPYING index 0408a7e40b7..a632d6f58b1 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2016 Eelco Dolstra and the Nixpkgs/NixOS contributors +Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the |