commit 03cfde2d1046fd76181308a48a59e25e1a532cc6
author wjia@webrtc.org <wjia@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jan 14 17:48:34 2014 +0000
committer wjia@webrtc.org <wjia@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jan 14 17:48:34 2014 +0000
tree 9049412b8fda66847df1b007a82acf10e11ff0fc
parent 8c5b27de9aa94791a72b04df80b8f274de8c0070

Roll Chromium 238260 -> 243863

R=andrew@webrtc.org, henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6939004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5385 4adac7df-926f-26a2-2b94-8c16560cd09d

.gitignore

diff --git a/.gitignore b/.gitignore
index 3ceaf9c..aab8f75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@
 .cproject
 .gdb_history
 .gdbinit
+.gn
 .metadata
 .project
 .pydevproject
@@ -36,6 +37,7 @@
 /Makefile
 /build
 /chromium_deps
+/chromium_gn
 /google_apis/build
 /gyp-mac-tool
 /net/third_party/nss/