Merged remote changes.

Sun, 15 Jan 2012 16:44:41 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 15 Jan 2012 16:44:41 +0100
changeset 1559
a28a552ba2e2
parent 1558
754120837dd8 (current diff)
parent 1554
9ee361ffef51 (diff)
child 1561
fe54c9df80e8

Merged remote changes.

--- a/eric5.e4p	Sun Jan 15 16:42:56 2012 +0100
+++ b/eric5.e4p	Sun Jan 15 16:44:41 2012 +0100
@@ -11,7 +11,7 @@
   <Description>eric5 is an integrated development environment for
 the Python and Ruby language. It uses the PyQt4
 bindings and the QScintilla2 editor widget.</Description>
-  <Version>5.2.0</Version>
+  <Version>5.3.0</Version>
   <Author>Detlev Offenbach</Author>
   <Email>detlev@die-offenbachs.de</Email>
   <TranslationPattern>i18n/eric5_%language%.ts</TranslationPattern>

eric ide

mercurial