mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-02 00:18:17 +00:00
Instructions for merging
This commit is contained in:
1 parent
b89be75ab6
commit
25b9bcf997
1 file changed
+9
@@ -0,0 +1,9 @@
|
||||
Instructions for merging repos
|
||||
==============================
|
||||
|
||||
Following https://stackoverflow.com/a/14470212
|
||||
|
||||
- Merge in cloudcam w/ ZK protocol
|
||||
- Merge in cloudcam w/ working GUI
|
||||
- Merge in realtime voice conversion
|
||||
|
||||
Reference in new issue
Block a user