Title: [114482] branches/safari-534.57-branch/WebKitLibraries
- Revision
- 114482
- Author
- [email protected]
- Date
- 2012-04-17 22:18:15 -0700 (Tue, 17 Apr 2012)
Log Message
Merge r97323.
Modified Paths
Property Changed
Diff
Property changes: branches/safari-534.57-branch/WebKitLibraries
Added: svn:mergeinfo
Modified: branches/safari-534.57-branch/WebKitLibraries/ChangeLog (114481 => 114482)
--- branches/safari-534.57-branch/WebKitLibraries/ChangeLog 2012-04-18 04:52:47 UTC (rev 114481)
+++ branches/safari-534.57-branch/WebKitLibraries/ChangeLog 2012-04-18 05:18:15 UTC (rev 114482)
@@ -1,3 +1,16 @@
+2012-04-17 Steve Falkenburg <[email protected]>
+
+ Merge 97323
+
+ 2011-10-11 Kent Tamura <[email protected]>
+
+ C4481 warning should be disabled for OVERRIDE and FINAL.
+ https://bugs.webkit.org/show_bug.cgi?id=69904
+
+ Reviewed by Adam Roben.
+
+ * win/tools/vsprops/common.vsprops: Disable C4481.
+
2012-04-17 Lucas Forschler <[email protected]>
Merge 113649
Modified: branches/safari-534.57-branch/WebKitLibraries/win/tools/vsprops/common.vsprops (114481 => 114482)
--- branches/safari-534.57-branch/WebKitLibraries/win/tools/vsprops/common.vsprops 2012-04-18 04:52:47 UTC (rev 114481)
+++ branches/safari-534.57-branch/WebKitLibraries/win/tools/vsprops/common.vsprops 2012-04-18 05:18:15 UTC (rev 114482)
@@ -15,7 +15,7 @@
WarningLevel="4"
WarnAsError="true"
DebugInformationFormat="3"
- DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4201;4244;4251;4275;4288;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
+ DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4201;4244;4251;4275;4288;4291;4305;4344;4355;4389;4481;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
/>
<Tool
Name="VCLibrarianTool"
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
