Mercurial Repositories > eric / file diff

--- a/eric6.e4p	Sun Mar 13 14:56:13 2016 +0100
+++ b/eric6.e4p	Sun Mar 13 20:54:42 2016 +0100
@@ -1266,9 +1266,15 @@
     <Source>ViewManager/BookmarkedFilesDialog.py</Source>
     <Source>ViewManager/ViewManager.py</Source>
     <Source>ViewManager/__init__.py</Source>
+    <Source>WebBrowser/AdBlock/AdBlockDialog.py</Source>
+    <Source>WebBrowser/AdBlock/AdBlockExceptionsDialog.py</Source>
+    <Source>WebBrowser/AdBlock/AdBlockIcon.py</Source>
     <Source>WebBrowser/AdBlock/AdBlockManager.py</Source>
     <Source>WebBrowser/AdBlock/AdBlockPage.py</Source>
+    <Source>WebBrowser/AdBlock/AdBlockRule.py</Source>
     <Source>WebBrowser/AdBlock/AdBlockSubscription.py</Source>
+    <Source>WebBrowser/AdBlock/AdBlockTreeWidget.py</Source>
+    <Source>WebBrowser/AdBlock/AdBlockUrlInterceptor.py</Source>
     <Source>WebBrowser/AdBlock/__init__.py</Source>
     <Source>WebBrowser/Bookmarks/AddBookmarkDialog.py</Source>
     <Source>WebBrowser/Bookmarks/BookmarkNode.py</Source>
@@ -1346,6 +1352,7 @@
     <Source>WebBrowser/History/__init__.py</Source>
     <Source>WebBrowser/JavaScript/ExternalJsObject.py</Source>
     <Source>WebBrowser/JavaScript/__init__.py</Source>
+    <Source>WebBrowser/Network/EricSchemeHandler.py</Source>
     <Source>WebBrowser/Network/FollowRedirectReply.py</Source>
     <Source>WebBrowser/Network/LoadRequest.py</Source>
     <Source>WebBrowser/Network/NetworkManager.py</Source>
@@ -1427,6 +1434,8 @@
     <Source>WebBrowser/ZoomManager/ZoomValuesModel.py</Source>
     <Source>WebBrowser/ZoomManager/__init__.py</Source>
     <Source>WebBrowser/__init__.py</Source>
+    <Source>WebBrowser/data/html_rc.py</Source>
+    <Source>WebBrowser/data/icons_rc.py</Source>
     <Source>WebBrowser/data/javascript_rc.py</Source>
     <Source>__init__.py</Source>
     <Source>cleanupSource.py</Source>
@@ -1827,6 +1836,8 @@
     <Form>VCS/CommandOptionsDialog.ui</Form>
     <Form>VCS/RepositoryInfoDialog.ui</Form>
     <Form>ViewManager/BookmarkedFilesDialog.ui</Form>
+    <Form>WebBrowser/AdBlock/AdBlockDialog.ui</Form>
+    <Form>WebBrowser/AdBlock/AdBlockExceptionsDialog.ui</Form>
     <Form>WebBrowser/Bookmarks/AddBookmarkDialog.ui</Form>
     <Form>WebBrowser/Bookmarks/BookmarkPropertiesDialog.ui</Form>
     <Form>WebBrowser/Bookmarks/BookmarksDialog.ui</Form>
@@ -1904,6 +1915,8 @@
     <Resource>IconEditor/cursors/cursors.qrc</Resource>
     <Resource>WebBrowser/Bookmarks/DefaultBookmarks.qrc</Resource>
     <Resource>WebBrowser/OpenSearch/DefaultSearchEngines/DefaultSearchEngines.qrc</Resource>
+    <Resource>WebBrowser/data/html.qrc</Resource>
+    <Resource>WebBrowser/data/icons.qrc</Resource>
     <Resource>WebBrowser/data/javascript.qrc</Resource>
   </Resources>
   <Interfaces/>
@@ -2026,6 +2039,9 @@
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Wiktionary.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Yahoo.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/YouTube.xml</Other>
+    <Other>WebBrowser/data/html/adblockPage.html</Other>
+    <Other>WebBrowser/data/icons/adBlockPlus16.png</Other>
+    <Other>WebBrowser/data/icons/adBlockPlus64.png</Other>
     <Other>WebBrowser/data/javascript/jquery-ui.js</Other>
     <Other>WebBrowser/data/javascript/jquery.js</Other>
     <Other>WebBrowser/data/javascript/qwebchannel.js</Other>