diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
commit | df88e41a572b1c67877cf96b5cbb3b4a792d5e16 (patch) | |
tree | 1194bf621eac69339c2be426c2dd2ff618f99733 /forms/qa/unoapi/forms.sce | |
parent | 4b874d7bf2f834d8d6685a85e9578eec8f518b1f (diff) | |
parent | 318df0840a52a623274b05dea1fa8503f8d0767b (diff) |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'forms/qa/unoapi/forms.sce')
-rw-r--r-- | forms/qa/unoapi/forms.sce | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/forms/qa/unoapi/forms.sce b/forms/qa/unoapi/forms.sce index 073472f03..8ac840e7c 100644 --- a/forms/qa/unoapi/forms.sce +++ b/forms/qa/unoapi/forms.sce @@ -24,7 +24,7 @@ -o forms.OImageButtonModel -o forms.OImageControlControl -o forms.OImageControlModel --o forms.OListBoxControl +#i114669 -o forms.OListBoxControl -o forms.OListBoxModel -o forms.ONavigationBarControl -o forms.ONavigationBarModel |