summaryrefslogtreecommitdiff
path: root/basegfx/source/color/bcolortools.cxx
diff options
context:
space:
mode:
authorthb <thb@openoffice.org>2010-03-31 14:57:58 +0200
committerthb <thb@openoffice.org>2010-03-31 14:57:58 +0200
commitce1a6f91416ea6a3ca8aa067c0fac1e909ee272c (patch)
treeb348c61c7a9879be115b03926a4ad0d7f5459f79 /basegfx/source/color/bcolortools.cxx
parent0755c94f9a36f7ccd23a52a58297033a05b10c80 (diff)
parentf099cd4586bf41f30dea8190dbd2bd7b4234cf60 (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 'basegfx/source/color/bcolortools.cxx')
-rw-r--r--basegfx/source/color/bcolortools.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx
index 960ccfad4d67..543097de3d77 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.cxx
@@ -2,14 +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: bcolor.cxx,v $
- *
- * $Revision: 1.2 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify