Title: [88262] trunk/Source/WebKit/chromium
- Revision
- 88262
- Author
- [email protected]
- Date
- 2011-06-07 13:51:27 -0700 (Tue, 07 Jun 2011)
Log Message
2011-06-07 Adam Barth <[email protected]>
Attempt to fix the cr-win build.
* features.gypi:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (88261 => 88262)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-07 20:49:01 UTC (rev 88261)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-07 20:51:27 UTC (rev 88262)
@@ -1,5 +1,11 @@
2011-06-07 Adam Barth <[email protected]>
+ Attempt to fix the cr-win build.
+
+ * features.gypi:
+
+2011-06-07 Adam Barth <[email protected]>
+
Reviewed by Dimitri Glazkov.
Synchronize features.gypi and features_override.gypi in preparation for removing features_override.gypi
Modified: trunk/Source/WebKit/chromium/features.gypi (88261 => 88262)
--- trunk/Source/WebKit/chromium/features.gypi 2011-06-07 20:49:01 UTC (rev 88261)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-06-07 20:51:27 UTC (rev 88262)
@@ -42,6 +42,7 @@
'use_accelerated_compositing%': 1,
'use_skia_gpu%': 0,
'use_threaded_compositing%': 0,
+ 'branding%': 'WebKit',
},
# We have to nest variables inside variables as a hack for variables
@@ -127,6 +128,7 @@
'use_accelerated_compositing%': '<(use_accelerated_compositing)',
'use_skia_gpu%': '<(use_skia_gpu)',
'use_threaded_compositing%': '<(use_threaded_compositing)',
+ 'branding%': '<(branding)',
'conditions': [
['use_accelerated_compositing==1', {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
