about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/libccd
Commit message (Collapse)AuthorAge
* 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