Merge remote-tracking branch 'remotes/upstream/master'

Makeblock-official · Jul 11, 2015 · 68e095c · 68e095c
2 parents ce67522 + 3b2fa0f
commit 68e095c
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git a/Laser Engraver Upgrade Pack Quick Start Guide.pdf b/Laser Engraver Upgrade Pack Quick Start Guide.pdf
diff --git a/distribution/windows/mDraw_v1.1.zip b/distribution/windows/mDraw_v1.1.zip
diff --git a/distribution/windows/mDraw.exe → mDrawBot User Guide - V1.0 - 0505.pdf b/distribution/windows/mDraw.exe → mDrawBot User Guide - V1.0 - 0505.pdf
diff --git a/mDrawBot User instruction V1.1 20150703.pdf b/mDrawBot User instruction V1.1 20150703.pdf
diff --git a/mDrawBot 使用指南-V1.0-0505.pdf b/mDrawBot 使用指南-V1.0-0505.pdf
diff --git a/mDrawGui/mDraw.py b/mDrawGui/mDraw.py
@@ -516,7 +516,7 @@ def loadPic(self,filename=False):
             return        
         self.clearPic()
         if filename==False:
-            filename = QFileDialog.getOpenFileName(self, 'Open Svg/Bmp', '', ".svg;.bmp(*.svg;*.bmp)")[0]
+            filename = QFileDialog.getOpenFileName(self, 'Open Svg/Bmp', '', ".svg .bmp(*.svg *.bmp)")[0]
         self.dbg(filename)
         if len(filename)==0:
             return