Branch: refs/heads/release-16.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 74139a6b585d2b8bd0922ca6b0baed79f2f5cc66
      
https://github.com/NixOS/nixpkgs/commit/74139a6b585d2b8bd0922ca6b0baed79f2f5cc66
  Author: Lluís Batlle i Rossell <[email protected]>
  Date:   2016-05-08 (Sun, 08 May 2016)

  Changed paths:
    A pkgs/development/libraries/bullet/bullet283.nix
    M pkgs/games/stuntrally/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Fixing stunt-rally 2.6 (adding newer bullet)

(cherry picked from commit f0c503593fd9d968407a94e26f9ef24279bf8012)

There were some weird conflicts.


_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to