Changeset 110080 in webkit

Timestamp:

Mar 7, 2012 11:58:18 AM (12 years ago)

Author:

ap@apple.com

Message:

Merge AsyncFileStream with FileStreamProxy
​https://bugs.webkit.org/show_bug.cgi?id=80325

Build fix.

• WebCore.xcodeproj/project.pbxproj: Removed files that got mysteriously added to the project with a merge.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-07  Alexey Proskuryakov  <ap@apple.com>
+
+        Merge AsyncFileStream with FileStreamProxy
+        https://bugs.webkit.org/show_bug.cgi?id=80325
+
+        Build fix.
+
+        * WebCore.xcodeproj/project.pbxproj: Removed files that got mysteriously added to the project
+        with a merge.
+
 2012-03-07  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -24542 +24542 @@
                                 FD537353137B651800008DCE /* ZeroPole.h in Headers */,
                                 E1CDE9221501916900862CC5 /* AsyncFileStream.h in Headers */,
-                                7728694F14F8882500F484DC /* EXTTextureFilterAnisotropic.h in Headers */,
-                                7728698414FD9ADA00F484DC /* JSEXTTextureFilterAnisotropic.h in Headers */,
                                 450CEBF115073BBE002BB149 /* LabelableElement.h in Headers */,
                         );
@@ -27518 +27516 @@
                                 FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
                                 E1CDE92015018ED000862CC5 /* AsyncFileStream.cpp in Sources */,
-                                7728694E14F8882500F484DC /* EXTTextureFilterAnisotropic.cpp in Sources */,
-                                7728698314FD9ADA00F484DC /* JSEXTTextureFilterAnisotropic.cpp in Sources */,
                                 450CEBF015073BBE002BB149 /* LabelableElement.cpp in Sources */,
                         );