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 +