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 | da8e718e08b3d9bb19b3939884c5f4ba71fc3f07 (patch) | |
tree | ffbefec84c811d0271dd22ec3d4eeefc408d474d /sd/sdi/makefile.mk | |
parent | 542222f04c17b7534d34c79d40d609b8eb6ec2fd (diff) | |
parent | 2b800723513199616bb04c6bb377b685c4bde218 (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 'sd/sdi/makefile.mk')
-rw-r--r-- | sd/sdi/makefile.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index 7eb22a96c770..ab128c378afc 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # 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: makefile.mk,v $ -# -# $Revision: 1.12 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |