From 25b9bcf997e30a69e1f3ee6874a2ff4e63a612d3 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 28 Mar 2022 23:32:37 -0400 Subject: [PATCH] Instructions for merging --- MERGE_TODO.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 MERGE_TODO.md diff --git a/MERGE_TODO.md b/MERGE_TODO.md new file mode 100644 index 0000000000..f5aecc7522 --- /dev/null +++ b/MERGE_TODO.md @@ -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 +