diff options
| author | s-ol <s-ol@users.noreply.github.com> | 2020-01-25 14:41:09 +0000 |
|---|---|---|
| committer | s-ol <s-ol@users.noreply.github.com> | 2020-01-25 14:41:09 +0000 |
| commit | 643dc0b56117a4549962dca95d0b3a4476f04012 (patch) | |
| tree | 12924b3156cb893233adfef3d5f1c4043b099563 /root | |
| parent | Merge branch 'ba' (diff) | |
| download | mmm-643dc0b56117a4549962dca95d0b3a4476f04012.tar.gz mmm-643dc0b56117a4549962dca95d0b3a4476f04012.zip | |
merge fixes
Diffstat (limited to 'root')
| -rw-r--r-- | root/projects/VJmidiKit/text$markdown+wide.md (renamed from root/projects/VJmidiKit/text$markdown+fullwidth.md) | 0 | ||||
| -rw-r--r-- | root/projects/demoloops/squaregrid/text$html+frag (renamed from root/projects/demoloops/squaregrid/text$html) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/root/projects/VJmidiKit/text$markdown+fullwidth.md b/root/projects/VJmidiKit/text$markdown+wide.md index 7767e93..7767e93 100644 --- a/root/projects/VJmidiKit/text$markdown+fullwidth.md +++ b/root/projects/VJmidiKit/text$markdown+wide.md diff --git a/root/projects/demoloops/squaregrid/text$html b/root/projects/demoloops/squaregrid/text$html+frag index aa33399..aa33399 100644 --- a/root/projects/demoloops/squaregrid/text$html +++ b/root/projects/demoloops/squaregrid/text$html+frag |