Title: [151860] tags/Safari-537.46.4/Source/WebKit
- Revision
- 151860
- Author
- [email protected]
- Date
- 2013-06-21 15:13:04 -0700 (Fri, 21 Jun 2013)
Log Message
Merged r151847. <rdar://problem/14231905>
Modified Paths
Diff
Modified: tags/Safari-537.46.4/Source/WebKit/ChangeLog (151859 => 151860)
--- tags/Safari-537.46.4/Source/WebKit/ChangeLog 2013-06-21 22:07:01 UTC (rev 151859)
+++ tags/Safari-537.46.4/Source/WebKit/ChangeLog 2013-06-21 22:13:04 UTC (rev 151860)
@@ -1,5 +1,15 @@
2013-06-21 Lucas Forschler <[email protected]>
+ Merge r151847
+
+ 2013-06-21 Roger Fong <[email protected]>
+
+ Unreviewed. Fix a missing parenthesis in include directory path.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props:
+
+2013-06-21 Lucas Forschler <[email protected]>
+
Merge r151787
2013-06-20 Roger Fong <[email protected]>
Modified: tags/Safari-537.46.4/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props (151859 => 151860)
--- tags/Safari-537.46.4/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props 2013-06-21 22:07:01 UTC (rev 151859)
+++ tags/Safari-537.46.4/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorCommon.props 2013-06-21 22:13:04 UTC (rev 151860)
@@ -5,7 +5,7 @@
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\Include\;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries\include\WebCore\ForwardingHeaders;$(WebKit_Libraries\include\WebCore;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ConfigurationBuildDir)\Include\;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\WebCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\include\WebCore;$(WebKit_Libraries)\Include;$(WebKit_Libraries)\Include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
