| Index: chrome/browser/chrome_browser_main_x11.cc
 | 
| ===================================================================
 | 
| --- chrome/browser/chrome_browser_main_x11.cc	(revision 131419)
 | 
| +++ chrome/browser/chrome_browser_main_x11.cc	(working copy)
 | 
| @@ -1,4 +1,4 @@
 | 
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 | 
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| @@ -15,7 +15,7 @@
 | 
|  #include "ui/base/x/x11_util_internal.h"
 | 
|  
 | 
|  #if defined(USE_LINUX_BREAKPAD)
 | 
| -#include "chrome/app/breakpad_linuxish.h"
 | 
| +#include "chrome/app/breakpad_linux.h"
 | 
|  #endif
 | 
|  
 | 
|  using content::BrowserThread;
 | 
| 
 | 
| Property changes on: chrome/browser/chrome_browser_main_x11.cc
 | 
| ___________________________________________________________________
 | 
| Added: svn:mergeinfo
 | 
| 
 | 
| 
 |