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_impltools.cxx | |
| parent | 0755c94f9a36f7ccd23a52a58297033a05b10c80 (diff) | |
| parent | f099cd4586bf41f30dea8190dbd2bd7b4234cf60 (diff) | |
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_impltools.cxx')
| -rwxr-xr-x | canvas/source/directx/dx_impltools.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx index 0067ea8e9b71..c298fb9238f9 100755 --- a/canvas/source/directx/dx_impltools.cxx +++ b/canvas/source/directx/dx_impltools.cxx @@ -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_impltools.cxx,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |