Reviewed by Darin.

        - fixed <rdar://problem/3685827> Add standard news feeds from marketing.

        * BookmarksController.m:
        (-[BookmarksController mergeBuiltInBookmarksIfNecessary]):
        Use a different file for Tiger than for Panther; only the Tiger one
        has the news feeds in it.

        * English.lproj/BuiltInBookmarks.plist:
        new file that contains news feeds from marketing

        * English.lproj/OldBuiltInBookmarks.plist:
        Added. New name for old file.

        * WebBookmark.m:
        (-[WebBookmark dictionaryRepresentation]):
        #ifdeffed hack to avoid writing out UUIDs; used for creating built-in bookmarks file

        * WebBookmarkLeaf.m:
        (-[WebBookmarkLeaf dictionaryRepresentation]):
        #ifdeffed hack to avoid writing out last visited time; used for creating built-in bookmarks file

        * WebBookmarkList.m:
        (-[WebBookmarkList dictionaryRepresentation]):
        #ifdeffed hack to avoid writing out proxy bookmarks; used for creating built-in bookmarks file

        * WebBrowser.pbproj/project.pbxproj:
        updated for new file

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@6867 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index b3b920215875f7ae3e757a9d31d9dfe5e971ca96..0ff1c95a81a59d6a3ab4c42ccf806dd35bee6835 100644 (file)
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -6,8 +6,6 @@
        objectVersion = 39;
        objects = {
                014CEA440018CDF011CA2923 = {
-                       buildRules = (
-                       );
                        buildSettings = {
                                DEBUG_CFLAGS = "";
                                GCC_DYNAMIC_NO_PIC = NO;
@@ -24,8 +22,6 @@
                        name = Development;
                };
                014CEA450018CDF011CA2923 = {
-                       buildRules = (
-                       );
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
                                INSTALL_PATH = "@executable_path/../Frameworks";
@@ -4095,8 +4091,6 @@
                        };
                };
                F58C8A07025BD3BC018635CA = {
-                       buildRules = (
-                       );
                        buildSettings = {
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                INSTALL_PATH = "@executable_path/../Frameworks";