Merged remote changes.

Wed, 25 May 2011 08:35:20 +0200

author
detlev@die-offenbachs.de
date
Wed, 25 May 2011 08:35:20 +0200
changeset 1059
700df567f70b
parent 1058
fa1c0fa31041 (current diff)
parent 1056
a3eb3c9a7e4b (diff)
child 1061
3e21869872e3

Merged remote changes.

--- a/QScintilla/Shell.py	Wed May 25 08:33:57 2011 +0200
+++ b/QScintilla/Shell.py	Wed May 25 08:35:20 2011 +0200
@@ -405,6 +405,8 @@
         self.inRawMode = False
         self.echoInput = True
         self.clientCapabilities = 0
+        self.inCommandExecution = False
+        self.interruptCommandExecution = False
         
     def __clientCapabilities(self, cap, clType):
         """

eric ide

mercurial