d02f75a8c3
Resolves: #i121420# merge sidebar feature
...
(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5)
Conflicts:
chart2/source/controller/dialogs/dlg_View3D.cxx
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
chart2/source/controller/inc/ViewElementListProvider.hxx
chart2/source/controller/inc/dlg_View3D.hxx
chart2/source/controller/main/ShapeController.cxx
chart2/source/inc/chartview/DrawModelWrapper.hxx
chart2/source/view/main/DrawModelWrapper.cxx
cui/source/inc/border.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/sdrcelldlg.hxx
cui/source/inc/treeopt.hxx
cui/source/options/optchart.cxx
cui/source/options/optchart.hxx
cui/source/options/optcolor.cxx
cui/source/options/treeopt.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tplneend.cxx
editeng/inc/editeng/outliner.hxx
extensions/source/propctrlr/standardcontrol.cxx
framework/source/register/registerservices.cxx
offapi/com/sun/star/ui/makefile.mk
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
postprocess/packregistry/makefile.mk
reportdesign/source/ui/dlg/Condition.cxx
reportdesign/source/ui/misc/UITools.cxx
sc/inc/document.hxx
sc/inc/helpids.h
sc/inc/sc.hrc
sc/prj/build.lst
sc/sdi/scalc.sdi
sc/source/core/data/documen9.cxx
sc/source/core/data/drwlayer.cxx
sc/source/ui/app/scdll.cxx
sc/source/ui/app/typemap.cxx
sc/source/ui/dbgui/scendlg.cxx
sc/source/ui/docshell/docsh2.cxx
sc/source/ui/docshell/docsh4.cxx
sc/source/ui/drawfunc/chartsh.cxx
sc/source/ui/drawfunc/drawsh.cxx
sc/source/ui/drawfunc/drawsh2.cxx
sc/source/ui/drawfunc/drawsh4.cxx
sc/source/ui/drawfunc/drformsh.cxx
sc/source/ui/drawfunc/drtxtob.cxx
sc/source/ui/drawfunc/drtxtob1.cxx
sc/source/ui/drawfunc/drtxtob2.cxx
sc/source/ui/drawfunc/graphsh.cxx
sc/source/ui/drawfunc/oleobjsh.cxx
sc/source/ui/inc/chartsh.hxx
sc/source/ui/inc/formatsh.hxx
sc/source/ui/miscdlgs/tabbgcolordlg.cxx
sc/source/ui/navipi/navipi.cxx
sc/source/ui/optdlg/opredlin.cxx
sc/source/ui/optdlg/tpview.cxx
sc/source/ui/sidebar/makefile.mk
sc/source/ui/view/auditsh.cxx
sc/source/ui/view/cellsh.cxx
sc/source/ui/view/editsh.cxx
sc/source/ui/view/formatsh.cxx
sc/source/ui/view/pivotsh.cxx
sc/source/ui/view/tabvwsh.cxx
sc/util/makefile.mk
sd/inc/sdabstdlg.hxx
sd/prj/build.lst
sd/sdi/ToolPanelViewShell.sdi
sd/sdi/makefile.mk
sd/source/ui/accessibility/makefile.mk
sd/source/ui/animations/CustomAnimationDialog.cxx
sd/source/ui/dlg/PaneChildWindows.cxx
sd/source/ui/dlg/PaneShells.cxx
sd/source/ui/dlg/copydlg.cxx
sd/source/ui/dlg/navigatr.cxx
sd/source/ui/dlg/sddlgfact.cxx
sd/source/ui/dlg/sddlgfact.hxx
sd/source/ui/docshell/docshel3.cxx
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
sd/source/ui/framework/factories/TaskPanelFactory.cxx
sd/source/ui/framework/factories/TaskPanelFactory.hxx
sd/source/ui/framework/factories/ViewShellWrapper.cxx
sd/source/ui/framework/factories/makefile.mk
sd/source/ui/framework/module/ImpressModule.cxx
sd/source/ui/framework/module/ToolPanelModule.cxx
sd/source/ui/framework/tools/FrameworkHelper.cxx
sd/source/ui/func/fuolbull.cxx
sd/source/ui/inc/DrawViewShell.hxx
sd/source/ui/inc/PaneChildWindows.hxx
sd/source/ui/inc/celltempl.hxx
sd/source/ui/inc/copydlg.hxx
sd/source/ui/inc/dlgpage.hxx
sd/source/ui/inc/framework/FrameworkHelper.hxx
sd/source/ui/inc/prltempl.hxx
sd/source/ui/inc/tabtempl.hxx
sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
sd/source/ui/inc/taskpane/PanelId.hxx
sd/source/ui/inc/tpaction.hxx
sd/source/ui/sidebar/AllMasterPagesSelector.cxx
sd/source/ui/sidebar/AllMasterPagesSelector.hxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
sd/source/ui/sidebar/DocumentHelper.cxx
sd/source/ui/sidebar/DocumentHelper.hxx
sd/source/ui/sidebar/LayoutMenu.cxx
sd/source/ui/sidebar/LayoutMenu.hxx
sd/source/ui/sidebar/MasterPageContainer.cxx
sd/source/ui/sidebar/MasterPageContainer.hxx
sd/source/ui/sidebar/MasterPageContainerFiller.cxx
sd/source/ui/sidebar/MasterPageContainerFiller.hxx
sd/source/ui/sidebar/MasterPageContainerProviders.cxx
sd/source/ui/sidebar/MasterPageContainerProviders.hxx
sd/source/ui/sidebar/MasterPageContainerQueue.cxx
sd/source/ui/sidebar/MasterPageContainerQueue.hxx
sd/source/ui/sidebar/MasterPageDescriptor.cxx
sd/source/ui/sidebar/MasterPageDescriptor.hxx
sd/source/ui/sidebar/MasterPageObserver.cxx
sd/source/ui/sidebar/MasterPagesSelector.cxx
sd/source/ui/sidebar/MasterPagesSelector.hxx
sd/source/ui/sidebar/PreviewValueSet.cxx
sd/source/ui/sidebar/PreviewValueSet.hxx
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
sd/source/ui/sidebar/SidebarShellManager.cxx
sd/source/ui/sidebar/SlideTransitionPanel.hxx
sd/source/ui/sidebar/makefile.mk
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
sd/source/ui/table/TableDesignPane.hxx
sd/source/ui/toolpanel/ControlContainer.cxx
sd/source/ui/toolpanel/ControlContainerDescriptor.hxx
sd/source/ui/toolpanel/MethodGuard.hxx
sd/source/ui/toolpanel/ScrollPanel.cxx
sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx
sd/source/ui/toolpanel/SubToolPanel.cxx
sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
sd/source/ui/toolpanel/TitleBar.cxx
sd/source/ui/toolpanel/TitledControl.cxx
sd/source/ui/toolpanel/ToolPanel.cxx
sd/source/ui/toolpanel/ToolPanel.hxx
sd/source/ui/toolpanel/ToolPanelFactory.cxx
sd/source/ui/toolpanel/ToolPanelUIElement.cxx
sd/source/ui/toolpanel/ToolPanelUIElement.hxx
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
sd/source/ui/unoidl/UnoDocumentSettings.cxx
sd/source/ui/view/ViewShellBase.cxx
sd/source/ui/view/drtxtob.cxx
sd/source/ui/view/drviews3.cxx
sd/source/ui/view/drviews7.cxx
sd/source/ui/view/drviewsa.cxx
sd/source/ui/view/drviewsf.cxx
sd/source/ui/view/outlnvsh.cxx
sd/source/ui/view/sdview.cxx
sd/source/ui/view/viewshel.cxx
sd/uiconfig/sdraw/menubar/menubar.xml
sd/util/makefile.mk
sfx2/Package_inc.mk
sfx2/inc/sfx2/sfx.hrc
sfx2/inc/sfx2/sfxsids.hrc
sfx2/source/control/bindings.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/inc/templdgi.hxx
svx/AllLangResTarget_svx.mk
svx/Package_inc.mk
svx/inc/svx/XPropertyTable.hxx
svx/inc/svx/bmpmask.hxx
svx/inc/svx/colrctrl.hxx
svx/inc/svx/dialogs.hrc
svx/inc/svx/dlgctrl.hxx
svx/inc/svx/dlgutil.hxx
svx/inc/svx/drawitem.hxx
svx/inc/svx/fontwork.hxx
svx/inc/svx/galbrws.hxx
svx/inc/svx/sdr/table/tablecontroller.hxx
svx/inc/svx/svdmodel.hxx
svx/inc/svx/svdstr.hrc
svx/inc/svx/svxids.hrc
svx/inc/svx/svxitems.hrc
svx/inc/svx/xattr.hxx
svx/inc/svx/xflgrit.hxx
svx/inc/svx/xflhtit.hxx
svx/inc/svx/xit.hxx
svx/inc/svx/xlineit.hxx
svx/inc/svx/xlndsit.hxx
svx/inc/svx/xlnedit.hxx
svx/inc/svx/xlnstit.hxx
svx/inc/svx/xtable.hxx
svx/sdi/svx.sdi
svx/source/dialog/_bmpmask.cxx
svx/source/dialog/dialcontrol.cxx
svx/source/dialog/dlgctrl.cxx
svx/source/dialog/dlgutil.cxx
svx/source/dialog/fontwork.cxx
svx/source/gallery2/galbrws.cxx
svx/source/gallery2/galbrws1.cxx
svx/source/gallery2/gallery1.cxx
svx/source/items/drawitem.cxx
svx/source/items/svxitems.src
svx/source/sdr/attribute/sdrformtextattribute.cxx
svx/source/sidebar/ColorPanel.hxx
svx/source/sidebar/EmptyPanel.hrc
svx/source/sidebar/EmptyPanel.hxx
svx/source/sidebar/gallery/GalleryPanel.hxx
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdmodel.cxx
svx/source/svdraw/svdogrp.cxx
svx/source/svdraw/svdstr.src
svx/source/tbxctrls/tbcontrl.cxx
svx/source/unodraw/XPropertyTable.cxx
svx/source/unodraw/unoctabl.cxx
svx/source/xoutdev/XPropertyEntry.cxx
svx/source/xoutdev/xattr.cxx
svx/source/xoutdev/xattr2.cxx
svx/source/xoutdev/xtabbtmp.cxx
svx/source/xoutdev/xtabcolr.cxx
svx/source/xoutdev/xtabdash.cxx
svx/source/xoutdev/xtabgrdt.cxx
svx/source/xoutdev/xtabhtch.cxx
svx/source/xoutdev/xtable.cxx
svx/source/xoutdev/xtablend.cxx
svx/util/svx.component
sw/inc/cmdid.h
sw/inc/docsh.hxx
sw/inc/editsh.hxx
sw/inc/helpid.h
sw/inc/rcid.hrc
sw/inc/swabstdlg.hxx
sw/inc/swcommands.h
sw/sdi/swriter.sdi
sw/source/core/doc/docdesc.cxx
sw/source/core/draw/drawdoc.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/docshdrw.cxx
sw/source/ui/app/docshini.cxx
sw/source/ui/app/docst.cxx
sw/source/ui/config/optpage.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.hxx
sw/source/ui/fmtui/tmpdlg.cxx
sw/source/ui/inc/tmpdlg.hxx
sw/source/ui/misc/pggrid.cxx
sw/source/ui/shells/annotsh.cxx
sw/source/ui/shells/basesh.cxx
sw/source/ui/shells/beziersh.cxx
sw/source/ui/shells/drawdlg.cxx
sw/source/ui/shells/drawsh.cxx
sw/source/ui/shells/drformsh.cxx
sw/source/ui/shells/drwbassh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/drwtxtsh.cxx
sw/source/ui/shells/frmsh.cxx
sw/source/ui/shells/grfsh.cxx
sw/source/ui/shells/olesh.cxx
sw/source/ui/shells/tabsh.cxx
sw/source/ui/shells/textsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/shells/txtnum.cxx
sw/source/ui/uiview/viewtab.cxx
sw/source/ui/uno/unofreg.cxx
sw/source/ui/utlui/navipi.cxx
sw/util/sw.component
vcl/inc/vcl/split.hxx
vcl/inc/vcl/window.hxx
vcl/inc/window.h
vcl/source/window/split.cxx
vcl/source/window/window.cxx
vcl/source/window/window4.cxx
Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e
Resolves: #i122194# Adapted license text in propertypanel.hrc
then renamed it to ResourceDefinitions.hrc
(cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b)
Conflicts:
sfx2/Package_inc.mk
sfx2/source/sidebar/SidebarChildWindow.cxx
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
svx/source/sidebar/line/LinePropertyPanel.cxx
svx/source/sidebar/possize/PosSizePropertyPanel.cxx
sw/source/ui/sidebar/PagePropertyPanel.src
sw/source/ui/sidebar/WrapPropertyPanel.src
Change-Id: Ie009056a78ab108556717a501399c83b477b3548
Resolves: #i122194# finally I got the correct file name
Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a
More merge changes for optional sidebar:
revert toolpanel removal, restore and re-enable task pane
remove apparently un-used SidebarFactory module
add extra visibility annotation to ItemReceiverUpdate
2013-05-20 11:33:10 +01:00
0a29c5bedd
Resolves: #i119287# exchanged hard attributes for OLE and GraphicObject
...
...with new default StyleSheet for these objects
(cherry picked from commit 2868ea34151cfb623a6a8bf41862d430205d9784)
Conflicts:
sd/source/core/drawdoc4.cxx
svx/source/sdr/contact/viewcontactofgraphic.cxx
Change-Id: I4849101de2ac1da83c8fb0f2d68316774982d197
Resolves: #i119287# Adapted to get the needed style as default style
for all SdrGrafObj and SDrOle2Objs. Checked various scenarios, works
well.
(cherry picked from commit bc85939149f7ae5b65343d7f27bf302a8e31d4b1)
Conflicts:
sd/source/core/drawdoc.cxx
sd/source/ui/func/fuinsert.cxx
sd/source/ui/view/sdview4.cxx
Change-Id: I40a17216f5c11ebca073026f62f1e9ab9ddfd119
2013-04-11 11:20:23 +01:00
a0296296fb
fdo#60691 add modelines to *.src and *.hrc files
...
use solenv/bin/add-modulelines script for the task
and remove all UTF bom from *.src and *.hrc files
svx/source/dialog/hdft.src
Change-Id: I745d4f0fe9b05436a142a03f8512970f91c41bd4
2013-03-08 21:02:26 +00:00
5db5465cb8
translation of German comments in file sd/source/core/glob.src
...
Change-Id: I908876675bd05bce997a2a7ac111032e130c8316
2013-03-01 12:09:07 +00:00
837e2808f7
re-base on ALv2 code. Includes:
...
Patches contributed by Armin Le-Grand
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles...
http://svn.apache.org/viewvc?view=revision&revision=1293316
#118485# - Styles for OLEs are not saved.
http://svn.apache.org/viewvc?view=revision&revision=1182166
Patches contributed by Andre Fischer
http://svn.apache.org/viewvc?view=revision&revision=1172128
http://svn.apache.org/viewvc?view=revision&revision=1172133
Patch contributed by Ariel Constenla-Haile
i#118505# - Remove MN_OLE_OBJECT menu item from Draw/Impress
contextmenu - CWS contextmenu1
http://svn.apache.org/viewvc?view=revision&revision=1182915
Patch contributed by Zhang Jian Fang
#118876#, Add check if the OutlinerParaObject is created successfully
http://svn.apache.org/viewvc?view=revision&revision=1243381
restore a re-based rdbedit.
2012-11-28 12:48:36 +00:00
889de665ec
Typo ressource -> resource
...
Change-Id: Id13e7acfbe34eca5e124c9032d36d6f158bfb831
2012-07-30 09:26:00 +02:00
ac07fe9819
add defined but missing SfxInterface strings
2011-11-28 11:16:50 +00:00
a2dacd9205
remove empty Text [ x-comment ] entries
2011-11-08 11:28:33 +01:00
c61cd1a5a2
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
2011-03-12 20:06:58 +01:00
310a174012
Remove unused misc.hxx and its references
2011-03-01 23:33:43 +01:00
21015b5d04
impressdefaults1: #i111998# reverted string changes since quick text edit is defaulted to on again
2010-12-03 13:48:55 +01:00
77e72565aa
impressdefaults1: #i111998# changing defaults according to ux findings
2010-09-22 12:39:48 +02:00
a7df737242
fixed unix warnings
2010-04-13 12:10:03 +02:00
790c58e573
renamed 'Click to add an outline' to 'Click to add text'
2010-03-26 15:37:28 +01:00
9e19ff00c7
changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
2010-02-12 15:01:35 +01:00
3091ca700e
INTEGRATION: CWS impress141 (1.70.6); FILE MERGED
...
2008/04/21 13:33:14 cl 1.70.6.1: #i87766# removed DE strings
2008-06-09 14:09:54 +00:00
af27b420bb
INTEGRATION: CWS changefileheader (1.68.14); FILE MERGED
...
2008/03/31 13:56:45 rt 1.68.14.1: #i87441# Change license header to LPGL v3.
2008-04-10 17:37:48 +00:00
b1ea980329
INTEGRATION: CWS presenterview (1.65.250); FILE MERGED
...
2008/03/26 10:44:55 cl 1.65.250.4: RESYNC: (1.67-1.68); FILE MERGED
2007/09/11 15:23:03 af 1.65.250.3: RESYNC: (1.66-1.67); FILE MERGED
2007/07/11 08:49:50 af 1.65.250.2: RESYNC: (1.65-1.66); FILE MERGED
2007/03/12 14:47:56 af 1.65.250.1: #i74730# Removed unused SlideViewShell.
2008-04-03 12:23:50 +00:00
dd5c974c75
INTEGRATION: CWS impresstables2 (1.65.242); FILE MERGED
...
2007/10/11 21:35:10 cl 1.65.242.4: RESYNC: (1.66-1.67); FILE MERGED
2007/07/26 17:52:35 cl 1.65.242.3: #i68103# added cell styles
2007/05/07 17:01:45 cl 1.65.242.2: RESYNC: (1.65-1.66); FILE MERGED
2007/05/03 09:31:25 cl 1.65.242.1: new table toolbar
2008-03-12 10:26:49 +00:00
433786547e
INTEGRATION: CWS pj84 (1.66.106); FILE MERGED
...
2007/08/25 13:22:23 pjanik 1.66.106.1: #i53857#: Remove ifdef STARIMAGE_AVAILABLE from the resources. Keep
other instances in place.
2007-09-06 07:47:06 +00:00
9673f3865a
INTEGRATION: CWS mergede01 (1.65.230); FILE MERGED
...
2007/03/20 14:38:02 ihi 1.65.230.1: #i72301# Remove German
2007-04-19 11:12:29 +00:00
d75f0aabee
INTEGRATION: CWS sb48 (1.64.152); FILE MERGED
...
2006/03/15 11:05:19 sb 1.64.152.1: #i59269# Added terminating punctuation to error resource strings.
2006-03-27 08:07:12 +00:00
6352bc0c36
INTEGRATION: CWS fwk20 (1.61.188); FILE MERGED
...
2005/08/15 10:59:58 pb 1.61.188.1: fix: #i52395# FontWork -> Fontwork
2005-09-23 14:23:34 +00:00
029f65b712
INTEGRATION: CWS encup (1.61.80); FILE MERGED
...
2005/04/29 15:54:47 ihi 1.61.80.1: #i40603# German strings now UTF8 encoded
2005-09-23 11:23:55 +00:00
da3db4232d
INTEGRATION: CWS ooo19126 (1.61.198); FILE MERGED
...
2005/09/05 13:20:17 rt 1.61.198.1: #i54170# Change license header: remove SISSL
2005-09-09 02:12:05 +00:00
e476074143
INTEGRATION: CWS iha08 (1.60.24); FILE MERGED
...
2005/02/15 17:21:50 iha 1.60.24.1: #i40806# add strings for page and slide name
2005-02-21 11:10:48 +00:00
e86e88f923
INTEGRATION: CWS iha06 (1.58.122); FILE MERGED
...
2005/01/18 18:03:46 iha 1.58.122.3: RESYNC: (1.58-1.59); FILE MERGED
2005/01/17 19:53:31 iha 1.58.122.2: #i21968# replace german string 'Seite' with 'Folie'
2005/01/17 19:33:02 iha 1.58.122.1: #i21968# replace german 'Dia' with 'Folie'
2005-01-31 13:49:17 +00:00
ab87048958
INTEGRATION: CWS pj15 (1.58.118); FILE MERGED
...
2005/01/01 18:55:13 pjanik 1.58.118.1: #i39644#: Fix typo: "Text body justfied" -> "Text body justified"
2005-01-11 10:24:48 +00:00
c7d46344ed
INTEGRATION: CWS encodingfix (1.56.90); FILE MERGED
...
2004/09/09 08:11:20 obo 1.56.90.1: #i31587# encoding problem for en-US
2004-09-09 08:00:44 +00:00
9a8f394b01
INTEGRATION: CWS jmf2 (1.55.64); FILE MERGED
...
2004/07/29 07:14:07 ka 1.55.64.4: #i3316#: string finalization
2004/07/19 13:22:06 ka 1.55.64.3: #i3316#: added media objectbar
2004/07/14 00:53:41 ka 1.55.64.2: RESYNC: (1.55-1.56); FILE MERGED
2004/07/11 19:59:29 ka 1.55.64.1: media support
2004-08-12 08:13:54 +00:00
0e1e981109
INTEGRATION: CWS mergebuild (1.53.58); FILE MERGED
...
2004/05/21 16:51:49 hjs 1.53.58.6: #i8252# fix resync problems
2004/05/18 13:48:25 hjs 1.53.58.5: RESYNC: (1.54-1.55); FILE MERGED
2004/04/20 21:41:36 hjs 1.53.58.4: RESYNC: (1.53-1.54); FILE MERGED
2004/02/23 11:36:29 ihi 1.53.58.3: Merge-While-Build update
2003/11/11 19:21:57 ihi 1.53.58.2: en -> en-US
2003/11/10 17:39:45 ihi 1.53.58.1: #111234# Merge during build
2004-06-26 16:53:34 +00:00
980c162657
INTEGRATION: CWS sj05 (1.53.52); FILE MERGED
...
2004/02/13 14:41:15 sj 1.53.52.2: RESYNC: (1.53-1.54); FILE MERGED
2004/01/23 17:19:19 cl 1.53.52.1: #i20484# adding autoshape ui
2004-04-02 12:20:38 +00:00
e73fe917e0
INTEGRATION: CWS geordi2q11 (1.53.128); FILE MERGED
...
2003/12/16 15:37:43 hr 1.53.128.1: #111934#: join CWS ooo111fix1
2003-12-17 18:33:37 +00:00
f785172c2e
INTEGRATION: CWS mergerc3 (1.52.8); FILE MERGED
...
2003/07/16 17:00:09 ihi 1.52.8.1: rc-3 merge all languages
2003-07-17 11:39:15 +00:00
b4e3418e11
INTEGRATION: CWS rc2merge (1.51.18); FILE MERGED
...
2003/07/03 14:32:33 ihi 1.51.18.1: rc-2 merge all languages
2003-07-03 16:05:57 +00:00
55ab3a0e06
INTEGRATION: CWS rcmerge (1.50.36); FILE MERGED
...
2003/06/12 11:00:52 gh 1.50.36.1: final Merge RC
2003-06-13 11:58:34 +00:00
768332c818
INTEGRATION: CWS mergem8 (1.44.4.2.2.6.2.2.36); FILE MERGED
...
2003/04/29 08:29:47 gh 1.44.4.2.2.6.2.2.36.2: final merge for Beta2
2003/04/14 14:54:46 gh 1.44.4.2.2.6.2.2.36.1: merging all languages
2003-04-29 15:55:16 +00:00
2c32696a04
MWS_SRX644: migrate branch mws_srx644 -> HEAD
2003-03-27 09:58:12 +00:00
bb795bb331
Merge SRC641: 05.09.02 - 21:20:34
2002-09-05 18:23:54 +00:00
27c3472a9f
Merge SRC641: 26.02.02 - 15:21:12
2002-02-26 13:21:34 +00:00
eca981d727
Merge SRC641: 21.02.02 - 22:10:42
2002-02-21 20:11:00 +00:00
cfabd99ffa
Merge SRC641: 12/14/01 - 18:29:33
2001-12-14 16:31:49 +00:00
4809b24fca
Merge SRC641: 22.11.01 - 23:54:00
2001-11-22 22:53:38 +00:00
2ab99da379
Merge SRC641: 13.11.01 - 23:09:23
2001-11-13 22:10:05 +00:00
1c99bdb7a4
Merge SRC641: 31.10.01 - 22:53:18
2001-10-31 20:53:13 +00:00
ab20483719
Merge SRC641: 10/22/01 - 06:44:06
2001-10-22 03:43:42 +00:00
fbc075f33c
Merge SRC641: 17.10.01 - 23:26:43
2001-10-17 20:26:24 +00:00
0dad826e2e
Merge SRC641: 11.10.01 - 23:00:35
2001-10-11 20:01:09 +00:00
507a9342e5
Merge SRC641: 27.09.01 - 22:37:08
2001-09-27 19:37:42 +00:00
e4d2539c1c
Merge SRC641: 24.09.01 - 22:41:15
2001-09-24 19:39:57 +00:00
