diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 13:00:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:16:54 +0200 |
| commit | 1e389c976cc5326b08bd166785e643364bb2d8b4 (patch) | |
| tree | 58f51874e758fb2f6412f1d15717a5cfe1a8fb01 /pkgs/games/quake3/game | |
| parent | a8fc68a5c02488a2228a1dc4984a3fa6351002eb (diff) | |
| parent | 773595540bd3a52476a7c84799e374d086d1c648 (diff) | |
merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix
Diffstat (limited to 'pkgs/games/quake3/game')
0 files changed, 0 insertions, 0 deletions