diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-18 02:27:27 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-18 02:27:27 +0200 |
| commit | 57272eaaf5776f673b5141354a1d1e1af080d575 (patch) | |
| tree | 9241d5523e03af24cd7ba2e45dd8b0951a9fdeb1 /wizards/com/sun/star/wizards/letter/CGLetterWizard.java | |
| parent | 1df024d97cc44155566f8db279e8cdba37e95fcf (diff) | |
| parent | f9d40c2b591215b57ece4ba6e623b7808a7ae717 (diff) | |
Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards
Conflicts:
wizards/com/sun/star/wizards/common/Resource.java
merged resolved as per:
e52421bc118e9c5f3fce5a32ba9efdcad7627d92
9e91dbca08056fc31f388f5642fdfa3d2b910990
in the old components repository merging the corresponding commit
3b4fe490441f9f77829bc6c1ae30d79a4d50255b there
Diffstat (limited to 'wizards/com/sun/star/wizards/letter/CGLetterWizard.java')
| -rw-r--r-- | wizards/com/sun/star/wizards/letter/CGLetterWizard.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wizards/com/sun/star/wizards/letter/CGLetterWizard.java b/wizards/com/sun/star/wizards/letter/CGLetterWizard.java index 0a6cfd90ab42..9cb9a25bdc0b 100644 --- a/wizards/com/sun/star/wizards/letter/CGLetterWizard.java +++ b/wizards/com/sun/star/wizards/letter/CGLetterWizard.java @@ -2,7 +2,7 @@ ************************************************************************ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |