[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mjs at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit ddbd5c7abdee609ef60bac6c1221643e93bab4a0
Author: mjs at apple.com <mjs at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 12 18:32:14 2009 +0000

    Not reviewed, fixing previous comment.
    
    Remove accidental change to sunspider-compare-results
    
    * Scripts/sunspider-compare-results:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52053 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 34bccaf..9c54adc 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-12  Maciej Stachowiak  <mjs at apple.com>
+
+        Not reviewed, fixing previous comment.
+
+        Remove accidental change to sunspider-compare-results
+
+        * Scripts/sunspider-compare-results:
+
 2009-12-11  Yael Aharon  <yael.aharon at nokia.com>
 
         Unreviewed build fix for Qt versions < 4.6. 
diff --git a/WebKitTools/Scripts/sunspider-compare-results b/WebKitTools/Scripts/sunspider-compare-results
index 568010c..a207d7a 100755
--- a/WebKitTools/Scripts/sunspider-compare-results
+++ b/WebKitTools/Scripts/sunspider-compare-results
@@ -93,10 +93,10 @@ sub pathToBuiltJSC($)
 
 sub pathToSystemJSC()
 {
-#    my $path = "/System/Library/Frameworks/JavaScriptCore.framework/Resources/jsc";
-#    if (-f $path) {
-#        return $path;
-#    }
+    my $path = "/System/Library/Frameworks/JavaScriptCore.framework/Resources/jsc";
+    if (-f $path) {
+        return $path;
+    }
     return undef;
 }
 

-- 
WebKit Debian packaging