webkit/webkit.xcodeproj/project.pbxproj - Issue 11017: Merge WebKit from r38950 -> r39000

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/webkit.xcodeproj/project.pbxproj

Side-by-side diff isn't available for this file because of its large size.

Issue 11017: Merge WebKit from r38950 -> r39000 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Download patch

Index: webkit/webkit.xcodeproj/project.pbxproj

===================================================================

--- webkit/webkit.xcodeproj/project.pbxproj (revision 6544)

+++ webkit/webkit.xcodeproj/project.pbxproj (working copy)

@@ -3984,6 +3984,7 @@

93BF8E650EA6AED30030F05C /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResourceRequest.h; path = chromium/ResourceRequest.h; sourceTree = "<group>"; };

93BF8E660EA6AED30030F05C /* ResourceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResourceResponse.h; path = chromium/ResourceResponse.h; sourceTree = "<group>"; };

93BF8F510EA6BD870030F05C /* AccessibilityObjectChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityObjectChromium.cpp; sourceTree = "<group>"; };

+ A7218BEB0EEDF5BD000FC021 /* CSSSelectorList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CSSSelectorList.cpp; path = ../third_party/WebKit/WebCore/css/CSSSelectorList.cpp; sourceTree = SOURCE_ROOT; };

A80DD9160EE4A85900728DDE /* PurgeableBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurgeableBuffer.h; sourceTree = "<group>"; };

A80DD9180EE4A87900728DDE /* PurgeableBufferMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PurgeableBufferMac.cpp; sourceTree = "<group>"; };

AB332F4B0E95497E0020F882 /* AnimationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationController.cpp; path = animation/AnimationController.cpp; sourceTree = "<group>"; };

@@ -4607,6 +4608,7 @@

7B5E77540D7F22D8001ECF42 = {

isa = PBXGroup;

children = (

+ A7218BEB0EEDF5BD000FC021 /* CSSSelectorList.cpp */,

7BF8842B0E71C100000BAF8A /* Configuration */,

7BF889C10E71CEA6000BAF8A /* generated */,

825404E50D92E3BB0006B936 /* glue */,

« no previous file with comments | « webkit/build/WebCore/WebCore.vcproj ('k') | no next file » | no next file with comments »