fix temp file for minor doc change

Xilinx · Sep 15, 2016 · cf21634 · cf21634
1 parent 8ddb9b1
commit cf21634
Show file tree

Hide file tree

Showing 13 changed files with 33,705 additions and 12 deletions.
diff --git a/Pynq-Z1/bitstream/base.bit b/Pynq-Z1/bitstream/base.bit
diff --git a/Pynq-Z1/bitstream/base.bit.REMOVED.git-id b/Pynq-Z1/bitstream/base.bit.REMOVED.git-id
diff --git a/Pynq-Z1/notebooks/Examples/data/haarcascade_frontalface_default.xml b/Pynq-Z1/notebooks/Examples/data/haarcascade_frontalface_default.xml
diff --git a/Pynq-Z1/notebooks/Examples/data/haarcascade_frontalface_default.xml.REMOVED.git-id b/Pynq-Z1/notebooks/Examples/data/haarcascade_frontalface_default.xml.REMOVED.git-id
diff --git a/Pynq-Z1/notebooks/Examples/python_random.ipynb b/Pynq-Z1/notebooks/Examples/python_random.ipynb
diff --git a/Pynq-Z1/notebooks/Examples/python_random.ipynb.REMOVED.git-id b/Pynq-Z1/notebooks/Examples/python_random.ipynb.REMOVED.git-id
diff --git a/Pynq-Z1/notebooks/Examples/video_filters.ipynb b/Pynq-Z1/notebooks/Examples/video_filters.ipynb
diff --git a/Pynq-Z1/notebooks/Examples/video_filters.ipynb.REMOVED.git-id b/Pynq-Z1/notebooks/Examples/video_filters.ipynb.REMOVED.git-id
diff --git a/Pynq-Z1/sdk/bootbin/u-boot.elf b/Pynq-Z1/sdk/bootbin/u-boot.elf
diff --git a/Pynq-Z1/sdk/bootbin/u-boot.elf.REMOVED.git-id b/Pynq-Z1/sdk/bootbin/u-boot.elf.REMOVED.git-id
diff --git a/docs/source/temp/6b_base_overlay_video.tmp b/docs/source/temp/6b_base_overlay_video.tmp
@@ -500,7 +500,7 @@
     "* 0 if stopped\n",
     "* 1 if running\n",
     "\n",
-    "After initialization, the display resolution is set at the lowest level: 640x480@60Hz. \n",
+    "After initialization, the display resolution is set at the lowest level: 640x480 at 60Hz. \n",
     "\n",
     "To check the current resolution:"
    ]
@@ -559,11 +559,11 @@
    "source": [
     "Valid resolutions are:\n",
     "\n",
-    "* 0 : '640x480@60Hz' \n",
-    "* 1 : '800x600@60Hz' \n",
-    "* 2 : '1280x720@60Hz' \n",
-    "* 3 : '1280x1024@60Hz' \n",
-    "* 4 : '1920x1080@60Hz' \n"
+    "* 0 : 640x480, 60Hz \n",
+    "* 1 : 800x600, 60Hz \n",
+    "* 2 : 1280x720, 60Hz \n",
+    "* 3 : 1280x1024, 60Hz \n",
+    "* 4 : 1920x1080, 60Hz \n"
    ]
   },
   {

diff --git a/python/pynq/drivers/tests/pynq_welcome.pdm b/python/pynq/drivers/tests/pynq_welcome.pdm
diff --git a/python/pynq/drivers/tests/pynq_welcome.pdm.REMOVED.git-id b/python/pynq/drivers/tests/pynq_welcome.pdm.REMOVED.git-id