Commit 12b15ba
committed
Merge branch 'master' into cossacklabs
Sync our branch with upstream updates. The updates add Apple Silicon
support (with hardware acceleration), XCFrameworks, and other updates.
The following commits on our branch are now obsolete:
- 4e7bf92
Note that due to the changes our Makefile build system is currently
broken. The following commits will fix this. This one only gets the
merge correctly.File tree
33 files changed
+1349
-493
lines changed- Demo.xcodeproj
- Demo.xcworkspace
- DemoTests
- Demo
- Assets.xcassets
- AccentColor.colorset
- AppIcon.appiconset
- Base.lproj
- assets
- Catalyst
- Watch
- config
- scripts
33 files changed
+1349
-493
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
9 | 17 | | |
10 | 18 | | |
11 | 19 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
0 commit comments