Skip to content
Snippets Groups Projects
Commit 8ae69514 authored by Guillaume Samson's avatar Guillaume Samson :snowman2:
Browse files

Merge branch 'cherry-pick-17646f45' into 'branch_4.2' 

Merge branch 'asm_flags_hardcoded' into 'branch_4.2'

See merge request nemo/nemo!367
parents d3280950 1741c8ec
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment