Merged remote changes.

Sun, 13 Jun 2010 15:46:12 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 13 Jun 2010 15:46:12 +0200
changeset 348
01246ad582c3
parent 347
0b1a7a38f8e9 (current diff)
parent 345
abe576eec80d (diff)
child 350
db40effc5c65

Merged remote changes.

diff -r 0b1a7a38f8e9 -r 01246ad582c3 Helpviewer/Bookmarks/DefaultBookmarks.py
--- a/Helpviewer/Bookmarks/DefaultBookmarks.py	Sun Jun 13 15:45:06 2010 +0200
+++ b/Helpviewer/Bookmarks/DefaultBookmarks.py	Sun Jun 13 15:46:12 2010 +0200
@@ -38,7 +38,7 @@
             <bookmark href="http://qt-apps.org/">
                 <title>Qt-Apps.org</title>
             </bookmark>
-            <bookmark href="http://www.diotavelli.net/PyQtWiki/"
+            <bookmark href="http://www.diotavelli.net/PyQtWiki/">
                 <title>PyQt Wiki</title>
             </bookmark>
         </folder>

eric ide

mercurial