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 | fe21d4635e6e0c9ad4156d67e3cdaa84becd75d0 (patch) | |
| tree | 5121d6a9c5812223fa872ca66ecaa5a69e8c39b2 /sal/qa/osl/semaphore/makefile.mk | |
| parent | b9f9fb6a8922a424d495adf2da6785a7ba3ea4cd (diff) | |
| parent | eb51d04fc6b6f6ef63c9194739b2c6fd6b2e29da (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 'sal/qa/osl/semaphore/makefile.mk')
| -rw-r--r-- | sal/qa/osl/semaphore/makefile.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sal/qa/osl/semaphore/makefile.mk b/sal/qa/osl/semaphore/makefile.mk index a8918dcfb..3cab9d650 100644 --- a/sal/qa/osl/semaphore/makefile.mk +++ b/sal/qa/osl/semaphore/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.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |