Merge branch 'QT5'

Conflicts: meShaderEd.py
ymesh · Oct 3, 2015 · 7bbe4f7 · 7bbe4f7
2 parents b102fcd + c2cf252
commit 7bbe4f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 252 deletions.
diff --git a/gui/exportShader/ui_exportShaderDialog.ui b/gui/exportShader/ui_exportShaderDialog.ui
diff --git a/meShaderEd.py b/meShaderEd.py
@@ -34,8 +34,10 @@
 	QtModule = QtWidgets
 
 root = normPath ( sys.path [0] )
+
 branchName = ''
 version = '0.3.4' + branchName
+
 __version__  = version
 
 app_settings = QtCore.QSettings ( QtCore.QSettings.IniFormat,