Merged remote changes.

Sun, 12 Feb 2012 16:52:06 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 12 Feb 2012 16:52:06 +0100
changeset 1616
40f0ddd40d8a
parent 1615
bf0fc9794f33 (current diff)
parent 1613
bafe0eeb0f30 (diff)
child 1619
56348a48c5e0

Merged remote changes.

--- a/UI/UserInterface.py	Sun Feb 12 16:51:07 2012 +0100
+++ b/UI/UserInterface.py	Sun Feb 12 16:52:06 2012 +0100
@@ -5736,7 +5736,7 @@
         try:
             if "-snapshot-" in Version:
                 # check snapshot version
-                if versions[2] > Version:
+                if versions[2][0] == "5" and versions[2] > Version:
                     res = E5MessageBox.yesNo(self,
                         self.trUtf8("Update available"),
                         self.trUtf8("""The update to <b>{0}</b> of eric5 is available"""

eric ide

mercurial