[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[dbates at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6a25c2da6beee62c7581c416dad4324c2a5930ea
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 23:26:34 2010 +0000

    2010-12-16  Daniel Bates  <dbates at rim.com>
    
            Formatting fix; un-indent one level all lines in [2793, 2808] (with respect to r74217)
            so as to be consistent with the formatting of the rest of this file.
    
            Also, add an empty line between the win32* and wince* conditional include blocks.
    
            * WebCore.pro:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74218 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 76da7c7..b23134c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-12-16  Daniel Bates  <dbates at rim.com>
 
+        Formatting fix; un-indent one level all lines in [2793, 2808] (with respect to r74217)
+        so as to be consistent with the formatting of the rest of this file.
+
+        Also, add an empty line between the win32* and wince* conditional include blocks.
+
+        * WebCore.pro:
+
+2010-12-16  Daniel Bates  <dbates at rim.com>
+
         Reviewed by Antonio Gomes.
 
         [Qt] Only include ScrollAnimatorWin.h and compile ScrollAnimatorWin.cpp
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index fc806bb..55198d0 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2790,22 +2790,23 @@ win32-*|wince* {
         platform/graphics/win/TransformationMatrixWin.cpp
 }
 
-    mac {
-        SOURCES += \
-            platform/text/cf/StringCF.cpp \
-            platform/text/cf/StringImplCF.cpp
-        LIBS_PRIVATE += -framework Carbon -framework AppKit
-    }
+mac {
+    SOURCES += \
+        platform/text/cf/StringCF.cpp \
+        platform/text/cf/StringImplCF.cpp
+    LIBS_PRIVATE += -framework Carbon -framework AppKit
+}
 
-    win32-* {
-        LIBS += -lgdi32
-        LIBS += -lole32
-        LIBS += -luser32
-    }
-    wince* {
-        LIBS += -lmmtimer
-        LIBS += -lole32
-    }
+win32-* {
+    LIBS += -lgdi32
+    LIBS += -lole32
+    LIBS += -luser32
+}
+
+wince* {
+    LIBS += -lmmtimer
+    LIBS += -lole32
+}
 
 contains (CONFIG, text_breaking_with_icu) {
     SOURCES += platform/text/TextBreakIteratorICU.cpp

-- 
WebKit Debian packaging