| Index: printing/units.h
|
| ===================================================================
|
| --- printing/units.h (revision 0)
|
| +++ printing/units.h (working copy)
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_PRINTING_UNITS_H__
|
| -#define CHROME_BROWSER_PRINTING_UNITS_H__
|
| +#ifndef PRINTING_UNITS_H_
|
| +#define PRINTING_UNITS_H_
|
|
|
| namespace printing {
|
|
|
| @@ -24,5 +24,4 @@
|
|
|
| } // namespace printing
|
|
|
| -#endif // CHROME_BROWSER_PRINTING_UNITS_H__
|
| -
|
| +#endif // PRINTING_UNITS_H_
|
|
|
| Property changes on: printing\units.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/chrome/browser/printing/units.h:r69-2775
|
|
|
|
|