diff options
| author | thb <thb@openoffice.org> | 2010-03-31 14:57:58 +0200 |
|---|---|---|
| committer | thb <thb@openoffice.org> | 2010-03-31 14:57:58 +0200 |
| commit | ce1a6f91416ea6a3ca8aa067c0fac1e909ee272c (patch) | |
| tree | b348c61c7a9879be115b03926a4ad0d7f5459f79 /canvas/source/directx/dx_canvas.hxx | |
| parent | Merged with dev300_m71 (diff) | |
| parent | masterfix DEV300: #i10000# gtk version workaround (diff) | |
| download | core-ce1a6f91416ea6a3ca8aa067c0fac1e909ee272c.tar.gz core-ce1a6f91416ea6a3ca8aa067c0fac1e909ee272c.zip | |
Merge DEV300_m75
* resolved two conflicts caused by lineend changes in
canvashelper_texturefill.cxx and implrenderer.cxx. Took the cws
version, which uses new texture fill semantics, and fixes clipping
bug
* binned file header changes from head for deleted files
Diffstat (limited to 'canvas/source/directx/dx_canvas.hxx')
| -rw-r--r-- | canvas/source/directx/dx_canvas.hxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 57349b650925..be15b875c4b6 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dx_canvas.hxx,v $ - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |