Skip to content
Snippets Groups Projects
Commit aeaca2a1 authored by Joe Garcia's avatar Joe Garcia
Browse files

Merge commit '52b291ad' into Jpeg_py3 

* commit '52b291ad':
  mk_scmi trim

# Conflicts:
#	ShellB3/shallbethree.sh
parents efa0db12 52b291ad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 0 deletions
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