[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
aroben at apple.com
aroben at apple.com
Wed Dec 22 17:48:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5d974822a498afc3fca586e6bbcd91cdb393eddb
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 30 18:20:12 2010 +0000
Let VS do its thang with WebCore.vcproj
I just removed and readded AnimationBase.cpp.
Rubber-stamped by Steve Falkenburg.
* WebCore.vcproj/WebCore.vcproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72928 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0f9c3da..9133ed3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-30 Adam Roben <aroben at apple.com>
+
+ Let VS do its thang with WebCore.vcproj
+
+ I just removed and readded AnimationBase.cpp.
+
+ Rubber-stamped by Steve Falkenburg.
+
+ * WebCore.vcproj/WebCore.vcproj:
+
2010-11-30 Mario Sanchez Prada <msanchez at igalia.com>
Reviewed by Chris Fleizach.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 288bb80..b713fad 100755
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -9851,7 +9851,7 @@
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaQueryList.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSKeyboardEvent.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -9870,7 +9870,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_Internal|Win32"
+ Name="Debug_Cairo_CFLite|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -9878,7 +9878,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_Cairo|Win32"
+ Name="Release_Cairo_CFLite|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -9886,7 +9886,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release_Cairo|Win32"
+ Name="Debug_All|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -9894,7 +9894,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug_All|Win32"
+ Name="Release_LTCG|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -9903,11 +9903,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaQueryList.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSKeyboardEvent.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSKeyboardEvent.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSLocation.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -9959,11 +9959,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSKeyboardEvent.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSLocation.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSLocation.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaError.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -10015,11 +10015,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSLocation.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaError.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaError.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaList.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -10071,11 +10071,11 @@
</FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaError.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaList.h"
>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaList.cpp"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaQueryList.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -10125,9 +10125,33 @@
Name="VCCLCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Internal|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
- RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaList.h"
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSMediaQueryList.h"
>
</File>
<File
@@ -46167,10 +46191,6 @@
>
</File>
<File
- RelativePath="..\editing\EditingBoundary.h"
- >
- </File>
- <File
RelativePath="..\editing\DeleteButtonController.cpp"
>
<FileConfiguration
@@ -46411,6 +46431,10 @@
>
</File>
<File
+ RelativePath="..\editing\EditingBoundary.h"
+ >
+ </File>
+ <File
RelativePath="..\editing\EditingStyle.cpp"
>
<FileConfiguration
@@ -64770,11 +64794,11 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\CookiesTable.js"
+ RelativePath="..\inspector\front-end\CookieParser.js"
>
</File>
<File
- RelativePath="..\inspector\front-end\CookieParser.js"
+ RelativePath="..\inspector\front-end\CookiesTable.js"
>
</File>
<File
@@ -64926,11 +64950,11 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\networkPanel.css"
+ RelativePath="..\inspector\front-end\NetworkItemView.js"
>
</File>
<File
- RelativePath="..\inspector\front-end\NetworkItemView.js"
+ RelativePath="..\inspector\front-end\networkPanel.css"
>
</File>
<File
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list