about summary refs log tree commit diff
path: root/nixpkgs/pkgs/games/vessel/default.nix
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'nixpkgs/nixos-unstable' HEAD masterAlyssa Ross7 days
|
* Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'Alyssa Ross2021-06-30
|
* Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'Alyssa Ross2021-06-22
| | | | | | | | | # Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
* Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'Alyssa Ross2021-01-26
|
* Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'Alyssa Ross2020-04-27
|
* Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'Alyssa Ross2019-03-11
|
* Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'Alyssa Ross2019-02-24
|
* Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'Alyssa Ross2019-01-07
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199