diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:29:02 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:43:21 -0400 |
| commit | 4920f6e634eeecb37b501bdc024dfe0aab849ed0 (patch) | |
| tree | c7dd5859715071cb602133b67449a29488027f70 /gnu/packages/crypto.scm | |
| parent | 513091dbd2eeba138b558f5f9bb1ee6e68eee01d (diff) | |
| parent | 3d297a0017210f1dd135592efb10846840a8af88 (diff) | |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
Diffstat (limited to 'gnu/packages/crypto.scm')
0 files changed, 0 insertions, 0 deletions