From 9a5d1c2d35caa9abc96a877810b33902bb63fb67 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Sun, 3 Oct 2010 21:24:14 +0000 Subject: [PATCH] Set eol-style property on all files. Future commits will use the subversion auto-props configuration at http://code.google.com/p/chromiumembedded/wiki/SubversionProperties git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@111 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 112 +++++++++++++++---------------- patch/patches/build.patch | 20 +++--- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 873160a55..86bc079c4 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -1,56 +1,56 @@ -The Chromium Embedded Framework (CEF) project is built on top of the Chromium -project source tree. Because of the Chromium project's constant state of flux -certain revisions of the CEF project may not be compatible with all Chromium -revisions, and visa-versa. This document tracks the combination of CEF -revision and Chromium revision that have been officially tested by the CEF -development team. The current CEF revision may be newer than the last CEF -revision listed in this document. In that case, it means that the current CEF -revision is compatible with the last listed Chromium revision. - -To update Chromium to a specific revision run the following command, where #### -is the Chromium revision number that you wish to download. - -gclient sync --revision src@#### --force - - - -Date | CEF Revision | Chromium Revision -------------------------------------------------------------------------------- -2008-12-02 | /trunk@2 | /trunk@6213 -2008-12-05 | /trunk@3 | /trunk@6430 -2008-12-13 | /trunk@4 | /trunk@6968 -2008-12-13 | /trunk@5 | /trunk@6975 -2009-01-14 | /trunk@6 | /trunk@8029 -2009-01-21 | /trunk@8 | /trunk@8386 -2009-01-27 | /trunk@9 | /trunk@8751 -2009-01-29 | /trunk@10 | /trunk@8875 -2009-02-04 | /trunk@14 | /trunk@9172 -2009-02-12 | /trunk@15 | /trunk@9652 -2009-03-05 | /trunk@17 | /trunk@10987 -2009-03-09 | /trunk@21 | /trunk@11252 -2009-03-24 | /trunk@22 | /trunk@11768 -2009-04-27 | /trunk@23 | /trunk@14651 -2009-05-15 | /trunk@24 | /trunk@16080 -2009-06-02 | /trunk@28 | /trunk@17397 -2009-07-24 | /trunk@32 | /trunk@21529 -2009-08-13 | /trunk@34 | /trunk@23266 -2009-08-20 | /trunk@35 | /trunk@23814 -2009-08-25 | /trunk@41 | /trunk@24210 -2009-09-17 | /trunk@42 | /trunk@26432 - After syncing to rev 26432 you must manually run 'gclient runhooks --force'. - Earlier and later revisions do not have this requirement. -2009-09-22 | /trunk@48 | /trunk@26790 -2009-10-02 | /trunk@51 | /trunk@27900 -2009-10-12 | /trunk@53 | /trunk@28713 -2009-10-18 | /trunk@58 | /trunk@29378 -2009-10-21 | /trunk@60 | /trunk@29687 -2009-10-25 | /trunk@61 | /trunk@30028 -2009-11-02 | /trunk@63 | /trunk@30778 -2009-11-04 | /trunk@64 | /trunk@31062 -2010-01-11 | /trunk@65 | /trunk@35902 -2010-02-11 | /trunk@71 | /trunk@38776 -2010-03-29 | /trunk@72 | /trunk@42941 -2010-06-21 | /trunk@82 | /trunk@50325 -2010-08-09 | /trunk@93 | /trunk@55388 -2010-09-12 | /trunk@102 | /trunk@59193 -2010-10-03 | /trunk@108 | /trunk@61327 +The Chromium Embedded Framework (CEF) project is built on top of the Chromium +project source tree. Because of the Chromium project's constant state of flux +certain revisions of the CEF project may not be compatible with all Chromium +revisions, and visa-versa. This document tracks the combination of CEF +revision and Chromium revision that have been officially tested by the CEF +development team. The current CEF revision may be newer than the last CEF +revision listed in this document. In that case, it means that the current CEF +revision is compatible with the last listed Chromium revision. + +To update Chromium to a specific revision run the following command, where #### +is the Chromium revision number that you wish to download. + +gclient sync --revision src@#### --force + + + +Date | CEF Revision | Chromium Revision +------------------------------------------------------------------------------- +2008-12-02 | /trunk@2 | /trunk@6213 +2008-12-05 | /trunk@3 | /trunk@6430 +2008-12-13 | /trunk@4 | /trunk@6968 +2008-12-13 | /trunk@5 | /trunk@6975 +2009-01-14 | /trunk@6 | /trunk@8029 +2009-01-21 | /trunk@8 | /trunk@8386 +2009-01-27 | /trunk@9 | /trunk@8751 +2009-01-29 | /trunk@10 | /trunk@8875 +2009-02-04 | /trunk@14 | /trunk@9172 +2009-02-12 | /trunk@15 | /trunk@9652 +2009-03-05 | /trunk@17 | /trunk@10987 +2009-03-09 | /trunk@21 | /trunk@11252 +2009-03-24 | /trunk@22 | /trunk@11768 +2009-04-27 | /trunk@23 | /trunk@14651 +2009-05-15 | /trunk@24 | /trunk@16080 +2009-06-02 | /trunk@28 | /trunk@17397 +2009-07-24 | /trunk@32 | /trunk@21529 +2009-08-13 | /trunk@34 | /trunk@23266 +2009-08-20 | /trunk@35 | /trunk@23814 +2009-08-25 | /trunk@41 | /trunk@24210 +2009-09-17 | /trunk@42 | /trunk@26432 + After syncing to rev 26432 you must manually run 'gclient runhooks --force'. + Earlier and later revisions do not have this requirement. +2009-09-22 | /trunk@48 | /trunk@26790 +2009-10-02 | /trunk@51 | /trunk@27900 +2009-10-12 | /trunk@53 | /trunk@28713 +2009-10-18 | /trunk@58 | /trunk@29378 +2009-10-21 | /trunk@60 | /trunk@29687 +2009-10-25 | /trunk@61 | /trunk@30028 +2009-11-02 | /trunk@63 | /trunk@30778 +2009-11-04 | /trunk@64 | /trunk@31062 +2010-01-11 | /trunk@65 | /trunk@35902 +2010-02-11 | /trunk@71 | /trunk@38776 +2010-03-29 | /trunk@72 | /trunk@42941 +2010-06-21 | /trunk@82 | /trunk@50325 +2010-08-09 | /trunk@93 | /trunk@55388 +2010-09-12 | /trunk@102 | /trunk@59193 +2010-10-03 | /trunk@108 | /trunk@61327 diff --git a/patch/patches/build.patch b/patch/patches/build.patch index 651db2a39..0a6bb8ab4 100644 --- a/patch/patches/build.patch +++ b/patch/patches/build.patch @@ -1,8 +1,8 @@ -Index: common.gypi -=================================================================== ---- common.gypi (revision 55388) -+++ common.gypi (working copy) -@@ -23,6 +23,9 @@ +Index: common.gypi +=================================================================== +--- common.gypi (revision 55388) ++++ common.gypi (working copy) +@@ -23,6 +23,9 @@ # Variables expected to be overriden on the GYP command line (-D) or by # ~/.gyp/include.gypi. @@ -12,11 +12,11 @@ Index: common.gypi # Putting a variables dict inside another variables dict looks kind of # weird. This is done so that "branding" and "buildtype" are defined as # variables within the outer variables dict here. This is necessary -Index: win/system.gyp -=================================================================== ---- win/system.gyp (revision 55388) -+++ win/system.gyp (working copy) -@@ -22,6 +22,13 @@ +Index: win/system.gyp +=================================================================== +--- win/system.gyp (revision 55388) ++++ win/system.gyp (working copy) +@@ -22,6 +22,13 @@ 'action': ['', '<@(_inputs)'], }, ],