Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Calamares
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

03d8e5e6

Commit 03d8e5e6 authored Sep 21, 2021 by Philip Müller

Downloads
- Plain Diff

Merge branch 'calamares' of https://github.com/calamares/calamares into development

parents 52ef084c ee4da8fc

No related branches found

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

CHANGES 14 additions, 0 deletions

CHANGES
CMakeLists.txt 2 additions, 2 deletions

CMakeLists.txt
src/libcalamares/utils/Entropy.cpp 4 additions, 2 deletions

src/libcalamares/utils/Entropy.cpp
src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp 25 additions, 7 deletions

src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp

with 45 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment