2011-01-11 Mihai Parparita <mihaip@chromium.org>

        Unreviewed. Update .gitignore with new Chromium dependency.

        ui/ was added with http://crrev.com/70743, we picked that up with a
        Chromium roll in r75311.

        Also alphabetizes the dependency list.

        * .gitignore:

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

diff --git a/.gitignore b/.gitignore
index f402030..904b0bf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -38,28 +38,29 @@ WebKit/chromium/.gclient
 WebKit/chromium/.gclient_entries
 
 # Ignore Chromium dependencies
+WebKit/chromium/.gclient
+WebKit/chromium/.gclient_entries
+WebKit/chromium/app/
 WebKit/chromium/base/
+WebKit/chromium/chromium_deps/
+WebKit/chromium/depot_tools/
 WebKit/chromium/gfx/
 WebKit/chromium/googleurl/
+WebKit/chromium/gpu/
 WebKit/chromium/ipc/
+WebKit/chromium/media/
 WebKit/chromium/net/
 WebKit/chromium/ppapi/
+WebKit/chromium/printing/
 WebKit/chromium/sdch/
 WebKit/chromium/skia/
 WebKit/chromium/testing/
 WebKit/chromium/third_party/
 WebKit/chromium/tools/
+WebKit/chromium/ui/
 WebKit/chromium/v8/
-WebKit/chromium/xcodebuild/
-WebKit/chromium/.gclient
-WebKit/chromium/.gclient_entries
-WebKit/chromium/app/
-WebKit/chromium/chromium_deps/
-WebKit/chromium/gpu/
-WebKit/chromium/media/
 WebKit/chromium/webkit/
-WebKit/chromium/printing/
-WebKit/chromium/depot_tools/
+WebKit/chromium/xcodebuild/
 
 # Ignore files that Chromium port generates
 /Makefile.chromium

diff --git a/ChangeLog b/ChangeLog
index 563a138..3b49ca3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-11  Mihai Parparita  <mihaip@chromium.org>
+
+        Unreviewed. Update .gitignore with new Chromium dependency.
+        
+        ui/ was added with http://crrev.com/70743, we picked that up with a
+        Chromium roll in r75311.
+        
+        Also alphabetizes the dependency list.
+
+        * .gitignore:
+
 2011-01-10  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 
         Reviewed by Csaba Osztrogonác.