Commit 1e47e88
committed
Merge branch 'dev' of https://github.com/unity3d-jp/MeshSync into spline_fixes
# Conflicts:
# Runtime/Shaders/ComputeShaderHelper.cs1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
0 commit comments