about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/libschrift
Commit message (Collapse)AuthorAge
* Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'Alyssa Ross2023-02-08
|
* Merge commit '3239fd2b8f728106491154b44625662e10259af2'Alyssa Ross2022-03-16
| | | | | Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix
* nixpkgs: merge nixos-unstableAlyssa Ross2021-02-16
|
* Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'Alyssa Ross2021-01-26