diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:32:23 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-31 19:34:57 +0100 |
| commit | dbae4f109f0ab3f676c8aa104d1f9bebcee85324 (patch) | |
| tree | 18c61fd667b95bf3a3322e5f40161d2028b3e42c /pkgs/games/planetaryannihilation/default.nix | |
| parent | 5dab625862a5690a35c122f3749eee31879a2415 (diff) | |
| parent | b50cabf2d4c1175da48af4df3132b246aa1c8d12 (diff) | |
| download | nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.gz nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.bz2 nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.lz nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.xz nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.tar.zst nixpkgs-dbae4f109f0ab3f676c8aa104d1f9bebcee85324.zip | |
Merge branch 'master' into staging
Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/games/planetaryannihilation/default.nix')
| -rw-r--r--[-rwxr-xr-x] | pkgs/games/planetaryannihilation/default.nix | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index bbf12065cc7..bbf12065cc7 100755..100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
|