Merged modifications from the 2.6 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 23:02:03 +00:00
parent a780a8dc19
commit 02b800ce7c
104 changed files with 14102 additions and 46560 deletions
--- a/wxPython/distrib/viewdocs.py
+++ b/wxPython/distrib/viewdocs.py
@@ -22,7 +22,6 @@ if os.access(basePath, os.W_OK):
    args = ['',
        '--cache='+basePath,
        os.path.join(basePath, 'wx.zip'),
-        os.path.join(basePath, 'ogl.zip'),
        ]

    # add any other .zip files found