third_party/WebKit/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj - Issue 21152: WebKit merge 40668:40722 part 1.

Unified Diff: third_party/WebKit/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

Issue 21152: WebKit merge 40668:40722 part 1. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 10 months ago

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

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj ('k') | third_party/WebKit/JavaScriptCore/JavaScriptCoreSources.bkl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

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

--- third_party/WebKit/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (revision 9310)

+++ third_party/WebKit/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (working copy)

@@ -40,6 +40,7 @@

088FA5BC0EF76D4300578E6F /* RandomNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 088FA5BA0EF76D4300578E6F /* RandomNumber.h */; settings = {ATTRIBUTES = (Private, ); }; };

08E279E90EF83B10007DB523 /* RandomNumberSeed.h in Headers */ = {isa = PBXBuildFile; fileRef = 08E279E80EF83B10007DB523 /* RandomNumberSeed.h */; };

0B1F921D0F1753500036468E /* PtrAndFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B1F921B0F17502D0036468E /* PtrAndFlags.h */; settings = {ATTRIBUTES = (Private, ); }; };

+ 0B330C270F38C62300692DE3 /* TypeTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0B330C260F38C62300692DE3 /* TypeTraits.cpp */; };

0B4D7E630F319AC800AD7E58 /* TypeTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B4D7E620F319AC800AD7E58 /* TypeTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };

140B7D1D0DC69AF7009C42B8 /* JSActivation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14DA818F0D99FD2000B0A4FB /* JSActivation.cpp */; };

140D17D70E8AD4A9000CD17D /* JSBasePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };

@@ -430,6 +431,7 @@

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

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

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

+ 0B330C260F38C62300692DE3 /* TypeTraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TypeTraits.cpp; sourceTree = "<group>"; };

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

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

141211020A48780900480255 /* minidom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minidom.c; path = tests/minidom.c; sourceTree = "<group>"; };

@@ -1092,6 +1094,7 @@

65162EF108E6A21C007556CD /* wtf */ = {

isa = PBXGroup;

children = (

+ 0B330C260F38C62300692DE3 /* TypeTraits.cpp */,

06D358A00DAAD9C4003B174E /* mac */,

E195678D09E7CF1200B89D13 /* unicode */,

938C4F690CA06BC700D9310A /* ASCIICType.h */,

@@ -2079,6 +2082,7 @@

93E26BD408B1514100F85226 /* pcre_xclass.cpp in Sources */,

A7A1F7AC0F252B3C00E184E2 /* ByteArray.cpp in Sources */,

BC3135650F302FA3003DFD3A /* DebuggerActivation.cpp in Sources */,

+ 0B330C270F38C62300692DE3 /* TypeTraits.cpp in Sources */,

);

runOnlyForDeploymentPostprocessing = 0;

};