diff options
author | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:43:00 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:43:00 +0000 |
commit | 65061190fc22bbc9b3d25a1f4324046e2ea53c0c (patch) | |
tree | cf2d625c6222b17646dd1876a7fadceeb707a511 | |
parent | 60384b1344e156e3ece91ca846e21ae399a9407a (diff) |
more merge fixesintegration/dev300_m101
-rw-r--r-- | packimages/pack/image-sort.lst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst index 5339b55..d7a615b 100644 --- a/packimages/pack/image-sort.lst +++ b/packimages/pack/image-sort.lst @@ -309,7 +309,6 @@ uiconfig/modules/swriter/toolbar/graphicobjectbar.xml uiconfig/modules/swriter/toolbar/insertbar.xml uiconfig/modules/swriter/toolbar/mediaobjectbar.xml uiconfig/modules/swriter/toolbar/moreformcontrols.xml -uiconfig/modules/swriter/toolbar/navigationobjectbar.xml uiconfig/modules/swriter/toolbar/numobjectbar.xml uiconfig/modules/swriter/toolbar/oleobjectbar.xml uiconfig/modules/swriter/toolbar/optimizetablebar.xml |