Title: [158367] trunk/Source/WebCore
- Revision
- 158367
- Author
- [email protected]
- Date
- 2013-10-31 10:39:56 -0700 (Thu, 31 Oct 2013)
Log Message
Fix a mis-merge.
* WebCore.xcodeproj/project.pbxproj: Remove duplicate CryptoAlgorithmRegistryMac.cpp.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158366 => 158367)
--- trunk/Source/WebCore/ChangeLog 2013-10-31 17:33:08 UTC (rev 158366)
+++ trunk/Source/WebCore/ChangeLog 2013-10-31 17:39:56 UTC (rev 158367)
@@ -1,5 +1,11 @@
2013-10-31 Alexey Proskuryakov <[email protected]>
+ Fix a mis-merge.
+
+ * WebCore.xcodeproj/project.pbxproj: Remove duplicate CryptoAlgorithmRegistryMac.cpp.
+
+2013-10-31 Alexey Proskuryakov <[email protected]>
+
Add bindings code for crypto algorithm dictionaries
https://bugs.webkit.org/show_bug.cgi?id=123476
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (158366 => 158367)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-10-31 17:33:08 UTC (rev 158366)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-10-31 17:39:56 UTC (rev 158367)
@@ -12563,7 +12563,6 @@
E172AF6B180F24C600FBADB9 /* CryptoAlgorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithm.cpp; sourceTree = "<group>"; };
E172AF6C180F24C600FBADB9 /* CryptoAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAlgorithm.h; sourceTree = "<group>"; };
E172AF6F180F289500FBADB9 /* CryptoKeyUsage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyUsage.h; sourceTree = "<group>"; };
- E172AF72180F352500FBADB9 /* CryptoAlgorithmRegistryMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CryptoAlgorithmRegistryMac.cpp; path = mac/CryptoAlgorithmRegistryMac.cpp; sourceTree = "<group>"; };
E172AF76180F366C00FBADB9 /* CryptoKeyFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKeyFormat.h; sourceTree = "<group>"; };
E172AF8D1811BC3700FBADB9 /* JSDOMPromise.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMPromise.cpp; sourceTree = "<group>"; };
E172AF8E1811BC3700FBADB9 /* JSDOMPromise.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMPromise.h; sourceTree = "<group>"; };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
