webkit/build/WebCore/WebCore.vcproj - Issue 10670: Do another merge using nifty new merge script (CL for that coming soon).

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: webkit/build/WebCore/WebCore.vcproj

Issue 10670: Do another merge using nifty new merge script (CL for that coming soon). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years, 1 month 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

OLD	NEW
1 <?xml version="1.0" encoding="Windows-1252"?>	1 <?xml version="1.0" encoding="Windows-1252"?>

2 <VisualStudioProject	2 <VisualStudioProject

3 ProjectType="Visual C++"	3 ProjectType="Visual C++"

4 Version="8.00"	4 Version="8.00"

5 Name="WebCore"	5 Name="WebCore"

6 ProjectGUID="{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"	6 ProjectGUID="{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"

7 RootNamespace="WebCore"	7 RootNamespace="WebCore"

8 Keyword="Win32Proj"	8 Keyword="Win32Proj"

9 >	9 >

10 <Platforms>	10 <Platforms>

(...skipping 1199 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1210 </File>	1210 </File>

1211 <File	1211 <File

1212 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatPoint3D.cpp"	1212 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatPoint3D.cpp"

1213 >	1213 >

1214 </File>	1214 </File>

1215 <File	1215 <File

1216 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatPoint3D.h"	1216 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatPoint3D.h"

1217 >	1217 >

1218 </File>	1218 </File>

1219 <File	1219 <File

	1220 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatQuad.cpp"

	1221 >

	1222 </File>

	1223 <File

	1224 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatQuad.h"

	1225 >

	1226 </File>

	1227 <File

1220 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatRect.cpp"	1228 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatRect.cpp"

1221 >	1229 >

1222 </File>	1230 </File>

1223 <File	1231 <File

1224 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatRect.h"	1232 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatRect.h"

1225 >	1233 >

1226 </File>	1234 </File>

1227 <File	1235 <File

1228 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatSize.cpp"	1236 RelativePath="..\..\..\third_party\WebKi t\WebCore\platform\graphics\FloatSize.cpp"

1229 >	1237 >

(...skipping 5503 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
6733 </FileConfiguration>	6741 </FileConfiguration>

6734 </File>	6742 </File>

6735 <File	6743 <File

6736 RelativePath="..\precompiled_webkit.h"	6744 RelativePath="..\precompiled_webkit.h"

6737 >	6745 >

6738 </File>	6746 </File>

6739 </Files>	6747 </Files>

6740 <Globals>	6748 <Globals>

6741 </Globals>	6749 </Globals>

6742 </VisualStudioProject>	6750 </VisualStudioProject>

OLD	NEW

« no previous file with comments | « webkit/build/WebCore/SConscript ('k') | no next file » | no next file with comments »