[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
simon.fraser at apple.com
simon.fraser at apple.com
Thu Apr 8 02:19:45 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 3a537434aa32a34e50e62b88613beb8f1b4e8184
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 11 23:57:24 2010 +0000
2010-03-11 Simon Fraser <simon.fraser at apple.com>
Reviewed by Mark Rowe.
Remove duplicate entries revealed after sorting.
* WebCore.xcodeproj/project.pbxproj:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55860 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a345475..8105e6d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,14 @@
Reviewed by Mark Rowe.
+ Remove duplicate entries revealed after sorting.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
+2010-03-11 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Mark Rowe.
+
Sort the project file (also removing some bogus spaces that caused Xcode to rewrite the file
every time you opened it).
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index a1e2144..3933fe3 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -14839,20 +14839,12 @@
49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */,
49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */,
93BA59B10F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp */,
- 93BA59B10F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp */,
- BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */,
BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */,
C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */,
- C0DFC86F0DB6841A003EAE7C /* JSConsoleCustom.cpp */,
- FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */,
FE700DD00F92D81A008E2BFE /* JSCoordinatesCustom.cpp */,
BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */,
- BC46C1ED0C0DDBDF0020CFC3 /* JSCSSRuleCustom.cpp */,
- 9392262E10321084006E7D5D /* JSCSSRuleListCustom.cpp */,
9392262E10321084006E7D5D /* JSCSSRuleListCustom.cpp */,
BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */,
- BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */,
- BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */,
BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */,
BCCE58AB1061E8CF008FB35A /* JSDatabaseCustom.cpp */,
BC77D1510FF19C730070887B /* JSDataGridColumnListCustom.cpp */,
@@ -15165,32 +15157,18 @@
1449E286107D4DB400B5793F /* JSCallbackData.cpp */,
1449E24A107D4A8400B5793F /* JSCallbackData.h */,
FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */,
- FE80D7A20E9C1ED2000D6F75 /* JSCustomPositionCallback.cpp */,
FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */,
- FE80D7A30E9C1ED2000D6F75 /* JSCustomPositionCallback.h */,
- FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */,
FE80D7A40E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.cpp */,
FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */,
- FE80D7A50E9C1ED2000D6F75 /* JSCustomPositionErrorCallback.h */,
- 51EC925B0CE90DD400F90308 /* JSCustomSQLStatementCallback.cpp */,
51EC925B0CE90DD400F90308 /* JSCustomSQLStatementCallback.cpp */,
51EC925C0CE90DD400F90308 /* JSCustomSQLStatementCallback.h */,
- 51EC925C0CE90DD400F90308 /* JSCustomSQLStatementCallback.h */,
51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */,
- 51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */,
- 51EC925E0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.h */,
51EC925E0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.h */,
51EC925F0CE90DD400F90308 /* JSCustomSQLTransactionCallback.cpp */,
- 51EC925F0CE90DD400F90308 /* JSCustomSQLTransactionCallback.cpp */,
- 51EC92600CE90DD400F90308 /* JSCustomSQLTransactionCallback.h */,
51EC92600CE90DD400F90308 /* JSCustomSQLTransactionCallback.h */,
51EC92610CE90DD400F90308 /* JSCustomSQLTransactionErrorCallback.cpp */,
- 51EC92610CE90DD400F90308 /* JSCustomSQLTransactionErrorCallback.cpp */,
- 51EC92620CE90DD400F90308 /* JSCustomSQLTransactionErrorCallback.h */,
51EC92620CE90DD400F90308 /* JSCustomSQLTransactionErrorCallback.h */,
1A3417C80CECFF250049CBDE /* JSCustomVoidCallback.cpp */,
- 1A3417C80CECFF250049CBDE /* JSCustomVoidCallback.cpp */,
- 1A3417C70CECFF250049CBDE /* JSCustomVoidCallback.h */,
1A3417C70CECFF250049CBDE /* JSCustomVoidCallback.h */,
E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */,
E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */,
@@ -17163,8 +17141,6 @@
316FE0800E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRule.h in Headers */,
316FE0820E6CCC2800BF6088 /* DOMWebKitCSSKeyframesRuleInternal.h in Headers */,
498391500F1E76B400C23782 /* DOMWebKitCSSMatrix.h in Headers */,
- 498391500F1E76B400C23782 /* DOMWebKitCSSMatrix.h in Headers */,
- 498391520F1E76B400C23782 /* DOMWebKitCSSMatrixInternal.h in Headers */,
498391520F1E76B400C23782 /* DOMWebKitCSSMatrixInternal.h in Headers */,
31611E610E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h in Headers */,
31611E630E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h in Headers */,
@@ -17837,8 +17813,6 @@
316FE0720E6CCBEE00BF6088 /* JSWebKitCSSKeyframeRule.h in Headers */,
316FE0740E6CCBEE00BF6088 /* JSWebKitCSSKeyframesRule.h in Headers */,
498391400F1E767500C23782 /* JSWebKitCSSMatrix.h in Headers */,
- 498391400F1E767500C23782 /* JSWebKitCSSMatrix.h in Headers */,
- 498391640F1E8EE100C23782 /* JSWebKitCSSMatrixConstructor.h in Headers */,
498391640F1E8EE100C23782 /* JSWebKitCSSMatrixConstructor.h in Headers */,
31611E5B0E1C4DE000F6A579 /* JSWebKitCSSTransformValue.h in Headers */,
494BD79E0F55C94C00747828 /* JSWebKitPoint.h in Headers */,
@@ -18579,7 +18553,6 @@
31288E730E3005D6003619AE /* WebKitCSSKeyframeRule.h in Headers */,
31288E750E3005D6003619AE /* WebKitCSSKeyframesRule.h in Headers */,
498391590F1E776900C23782 /* WebKitCSSMatrix.h in Headers */,
- 498391590F1E776900C23782 /* WebKitCSSMatrix.h in Headers */,
BC9ADD230CC4032600098C4C /* WebKitCSSTransformValue.h in Headers */,
494BD7950F55C8EE00747828 /* WebKitPoint.h in Headers */,
31C0FF250E4CEB6E007D6FE5 /* WebKitTransitionEvent.h in Headers */,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list