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 /svl/qa/complex/passwordcontainer/PasswordContainerTest.java | |
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 'svl/qa/complex/passwordcontainer/PasswordContainerTest.java')
-rw-r--r-- | svl/qa/complex/passwordcontainer/PasswordContainerTest.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/svl/qa/complex/passwordcontainer/PasswordContainerTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java index 5da0676f8bb9..0f4d97f28d56 100644 --- a/svl/qa/complex/passwordcontainer/PasswordContainerTest.java +++ b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java @@ -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: PasswordContainerTest.java,v $ - * - * $Revision: 1.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |