skia/README.chromium - Issue 19501: Rename README.google to README.chromium.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: skia/README.chromium

Issue 19501: Rename README.google to README.chromium. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

Property Changes:

Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/skia/README.google:r69-2775

« no previous file with comments | « google_update/README.google ('k') | skia/README.google » ('j') | no next file with comments »

OLD	NEW
1 This is a copy of the Skia source tree. In the original repository, the include	1 This is a copy of the Skia source tree. In the original repository, the include

2 directories and the "corecg" directories are separated out. On top of	2 directories and the "corecg" directories are separated out. On top of

3 libs/graphics -> skia	3 libs/graphics -> skia

4 we have the following mappings from source repository to our tree:	4 we have the following mappings from source repository to our tree:

5 include/corecg -> skia/include/corecg	5 include/corecg -> skia/include/corecg

6 include/graphics -> skia/include	6 include/graphics -> skia/include

7 libs/corecg -> skia/corecg	7 libs/corecg -> skia/corecg

8	8

9 platform/* are our own files that provide extra functionality we need our	9 platform/* are our own files that provide extra functionality we need our

10 Skia to implement.	10 Skia to implement.

11	11

12 DO NOT CHANGE THE SKIA FILES IN OUR TREE. These will be overwritten when we	12 DO NOT CHANGE THE SKIA FILES IN OUR TREE. These will be overwritten when we

13 sync to newer versions of Skia. The exception is platform/	13 sync to newer versions of Skia. The exception is platform/

14	14

15 THE EXCEPTION IS include/corecg/SkUserConfig.h which are the application's	15 THE EXCEPTION IS include/corecg/SkUserConfig.h which are the application's

16 definition of its options and environment. This file must be manually merged	16 definition of its options and environment. This file must be manually merged

17 with any changes in the Skia tree so that our options are preserved and we	17 with any changes in the Skia tree so that our options are preserved and we

18 also pick up any important changes they make.	18 also pick up any important changes they make.

19	19

20 -- brettw@google.com, 28 December 2006	20 -- brettw@google.com, 28 December 2006

21	21

22 Patches we are tracking locally (until Skia is fixed upstream):	22 Patches we are tracking locally (until Skia is fixed upstream):

23 fix_for_1186198.diff -- eseidel, 6/4/08, BUG=1186198	23 fix_for_1186198.diff -- eseidel, 6/4/08, BUG=1186198

24 linux_patch.diff	24 linux_patch.diff

OLD	NEW