Merged remote changes. 5_0_x

Tue, 01 Jun 2010 19:39:35 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 01 Jun 2010 19:39:35 +0200
branch
5_0_x
changeset 329
3d31db27f86e
parent 328
e38eaa05bf97 (diff)
parent 324
b0f65938f873 (current diff)
child 332
37619c8d6f0f

Merged remote changes.

--- a/Helpviewer/Bookmarks/DefaultBookmarks.py	Tue Jun 01 13:18:57 2010 +0200
+++ b/Helpviewer/Bookmarks/DefaultBookmarks.py	Tue Jun 01 19:39:35 2010 +0200
@@ -38,6 +38,9 @@
             <bookmark href="http://qt-apps.org/">
                 <title>Qt-Apps.org</title>
             </bookmark>
+            <bookmark href="http://www.diotavelli.net/PyQtWiki/"
+                <title>PyQt Wiki</title>
+            </bookmark>
         </folder>
         <folder folded="no">
             <title>Python Web Sites</title>

eric ide

mercurial