Merged remote changes.

Sun, 16 Jun 2013 15:37:09 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 16 Jun 2013 15:37:09 +0200
changeset 2721
63e4c6545ac1
parent 2720
a41f3093a03b (current diff)
parent 2718
af0ba4c4bea6 (diff)
child 2722
1c5df42d94bf

Merged remote changes.

diff -r a41f3093a03b -r 63e4c6545ac1 IconEditor/cursors/cursors_rc.py
--- a/IconEditor/cursors/cursors_rc.py	Sun Jun 16 15:36:43 2013 +0200
+++ b/IconEditor/cursors/cursors_rc.py	Sun Jun 16 15:37:09 2013 +0200
@@ -2,8 +2,8 @@
 
 # Resource object code
 #
-# Created: Fr. Dez 7 18:40:19 2012
-#      by: The Resource Compiler for PyQt (Qt v4.8.3)
+# Created: Sa. Jun 15 15:50:33 2013
+#      by: The Resource Compiler for PyQt (Qt v4.8.4)
 #
 # WARNING! All changes made in this file will be lost!
 
diff -r a41f3093a03b -r 63e4c6545ac1 Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Jun 16 15:36:43 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Jun 16 15:37:09 2013 +0200
@@ -1906,6 +1906,7 @@
         if not os.path.exists(cfgFile):
             try:
                 f = open(cfgFile, "w")
+                f.write("[ui]\nusername = Firstname Lastname <email_address>\n")
                 f.close()
             except (IOError, OSError):
                 # ignore these

eric ide

mercurial