Title: [154772] branches/safari-537.60-branch/Source/WebKit
- Revision
- 154772
- Author
- [email protected]
- Date
- 2013-08-28 13:01:32 -0700 (Wed, 28 Aug 2013)
Log Message
Merged r154642. <rdar://problem/14859824>
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebKit/ChangeLog (154771 => 154772)
--- branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-08-28 20:00:37 UTC (rev 154771)
+++ branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-08-28 20:01:32 UTC (rev 154772)
@@ -1,5 +1,16 @@
2013-08-28 Lucas Forschler <[email protected]>
+ Merge r154642
+
+ 2013-08-26 Roger Fong <[email protected]>
+
+ AppleWin build fix following r154627.
+
+ * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj:
+ * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj.filters:
+
+2013-08-28 Lucas Forschler <[email protected]>
+
Merge r154627
2013-08-21 Roger Fong <[email protected]>
Modified: branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj (154771 => 154772)
--- branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj 2013-08-28 20:00:37 UTC (rev 154771)
+++ branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj 2013-08-28 20:01:32 UTC (rev 154772)
@@ -145,9 +145,9 @@
<ClCompile Include="$(ConfigurationBuildDir)\obj32\WebKit\Interfaces\Accessible2_2_i.c" />
<ClCompile Include="$(ConfigurationBuildDir)\obj32\WebKit\Interfaces\AccessibleApplication_i.c" />
<ClCompile Include="$(ConfigurationBuildDir)\obj32\WebKit\Interfaces\AccessibleRelation_i.c" />
- <ClCompile Include="..\..\..\..\WebKitBuild\Release\obj32\WebKit\Interfaces\AccessibleEditableText_i.c" />
- <ClCompile Include="..\..\..\..\WebKitBuild\Release\obj32\WebKit\Interfaces\AccessibleText2_i.c" />
- <ClCompile Include="..\..\..\..\WebKitBuild\Release\obj32\WebKit\Interfaces\AccessibleText_i.c" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\Interfaces\AccessibleEditableText_i.c" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\Interfaces\AccessibleText2_i.c" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\Interfaces\AccessibleText_i.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj.filters (154771 => 154772)
--- branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj.filters 2013-08-28 20:00:37 UTC (rev 154771)
+++ branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj.filters 2013-08-28 20:01:32 UTC (rev 154772)
@@ -10,8 +10,8 @@
<ClCompile Include="$(ConfigurationBuildDir)\obj\WebKit\Interfaces\Accessible2_2_i.c" />
<ClCompile Include="$(ConfigurationBuildDir)\obj\WebKit\Interfaces\AccessibleApplication_i.c" />
<ClCompile Include="$(ConfigurationBuildDir)\obj\WebKit\Interfaces\AccessibleRelation_i.c" />
- <ClCompile Include="..\..\..\..\WebKitBuild\Release\obj32\WebKit\Interfaces\AccessibleEditableText_i.c" />
- <ClCompile Include="..\..\..\..\WebKitBuild\Release\obj32\WebKit\Interfaces\AccessibleText_i.c" />
- <ClCompile Include="..\..\..\..\WebKitBuild\Release\obj32\WebKit\Interfaces\AccessibleText2_i.c" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\Interfaces\AccessibleEditableText_i.c" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\Interfaces\AccessibleText_i.c" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebKit\Interfaces\AccessibleText2_i.c" />
</ItemGroup>
</Project>
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
