update merge

carlshi12r44 · Aug 7, 2020 · dc074b7 · dc074b7
1 parent 45a30be
commit dc074b7
Show file tree

Hide file tree

Showing 61 changed files with 1,241 additions and 329 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/__pycache__/merge.cpython-35.pyc b/__pycache__/merge.cpython-35.pyc
diff --git a/cnn/__pycache__/CNN.cpython-35.pyc b/cnn/__pycache__/CNN.cpython-35.pyc
diff --git a/config/__pycache__/CONFIG.cpython-35.pyc b/config/__pycache__/CONFIG.cpython-35.pyc
diff --git a/data/output/clips/Background/0.jpg b/data/output/clips/Background/0.jpg
diff --git a/data/output/clips/ImageButton/2.jpg b/data/output/clips/ImageButton/2.jpg
diff --git a/data/output/clips/ImageView/2.jpg → data/output/clips/ImageView/0.jpg b/data/output/clips/ImageView/2.jpg → data/output/clips/ImageView/0.jpg
diff --git a/data/output/clips/ImageView/1.jpg b/data/output/clips/ImageView/1.jpg
diff --git a/data/output/clips/ImageView/11.jpg b/data/output/clips/ImageView/11.jpg
diff --git a/data/output/clips/ImageView/12.jpg b/data/output/clips/ImageView/12.jpg
diff --git a/data/output/clips/ImageView/13.jpg b/data/output/clips/ImageView/13.jpg
diff --git a/data/output/clips/ImageView/14.jpg b/data/output/clips/ImageView/14.jpg
diff --git a/data/output/clips/ImageView/15.jpg b/data/output/clips/ImageView/15.jpg
diff --git a/data/output/clips/ImageView/16.jpg b/data/output/clips/ImageView/16.jpg
diff --git a/data/output/clips/ImageView/3.jpg b/data/output/clips/ImageView/3.jpg
diff --git a/data/output/clips/ImageView/4.jpg b/data/output/clips/ImageView/4.jpg
diff --git a/data/output/clips/ImageView/5.jpg b/data/output/clips/ImageView/5.jpg
diff --git a/data/output/clips/ImageView/6.jpg b/data/output/clips/ImageView/6.jpg
diff --git a/data/output/clips/ImageView/7.jpg b/data/output/clips/ImageView/7.jpg
diff --git a/data/output/clips/ImageView/8.jpg b/data/output/clips/ImageView/8.jpg
diff --git a/data/output/clips/ImageView/9.jpg b/data/output/clips/ImageView/9.jpg
diff --git a/data/output/clips/Text/1.jpg b/data/output/clips/Text/1.jpg
diff --git a/data/output/clips/Text/10.jpg b/data/output/clips/Text/10.jpg
diff --git a/data/output/clips/Text/11.jpg b/data/output/clips/Text/11.jpg
diff --git a/data/output/clips/Text/13.jpg b/data/output/clips/Text/13.jpg
diff --git a/data/output/clips/Text/15.jpg b/data/output/clips/Text/15.jpg
diff --git a/data/output/clips/Text/16.jpg b/data/output/clips/Text/16.jpg
diff --git a/data/output/clips/Text/7.jpg b/data/output/clips/Text/7.jpg
diff --git a/data/output/clips/Text/8.jpg b/data/output/clips/Text/8.jpg
diff --git a/data/output/clips/TextView/10.jpg b/data/output/clips/TextView/10.jpg
diff --git a/data/output/clips/TextView/17.jpg b/data/output/clips/TextView/17.jpg
diff --git a/data/output/clips/TextView/18.jpg b/data/output/clips/TextView/18.jpg
diff --git a/data/output/clips/TextView/19.jpg b/data/output/clips/TextView/19.jpg
diff --git a/data/output/clips/TextView/6.jpg b/data/output/clips/TextView/6.jpg
diff --git a/data/output/clips/TextView/9.jpg b/data/output/clips/TextView/9.jpg
diff --git a/data/output/clips/bkg.png b/data/output/clips/bkg.png