2011-04-18 Patrick Gansterer <paroga@webkit.org>

        Reviewed by Pavel Feldman.

        REGRESSION (r81479): generate-inspector-idl fails on native win32
        https://bugs.webkit.org/show_bug.cgi?id=58315

        Disable git autocrlf for Inspector.json.

        * .gitattributes:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84130 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitattributes b/.gitattributes
index 8117d8a884b14545e368c8ec0a2fbfd66130f926..6f24321ad8d44c850efc4dbec0ed550b0acda537 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -197,6 +197,7 @@ PerformanceTests/SunSpider/tests/parse-only/jquery-1.3.2.js -crlf
 Source/WebCore/accessibility/AccessibilityAllInOne.cpp -crlf
 Source/WebCore/bindings/js/JSExceptionBase.cpp -crlf
 Source/WebCore/bindings/js/JSExceptionBase.h -crlf
+Source/WebCore/inspector/Inspector.json -crlf
 Source/WebCore/manual-tests/DOMContextMenuEvent.html -crlf
 Source/WebCore/manual-tests/cursor-max-size.html -crlf
 Source/WebCore/manual-tests/drag-with-div-or-image-as-data-image.html -crlf

diff --git a/ChangeLog b/ChangeLog
index 80d043b7b19ce8332f874c43645be0258e118da7..dd856448dcf8386dde56f6d378394cd7e488f09d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-04-18  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Pavel Feldman.
+
+        REGRESSION (r81479): generate-inspector-idl fails on native win32
+        https://bugs.webkit.org/show_bug.cgi?id=58315
+
+        Disable git autocrlf for Inspector.json.
+
+        * .gitattributes:
+
 2011-04-16  Patrick Gansterer  <paroga@webkit.org>
 
         Reviewed by Eric Seidel.