diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:45 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:45 +0200 |
commit | 257a5147b5728c5cdceb640bef473774f677ab0b (patch) | |
tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /sd/source/ui/app/menuportal_tmpl.src | |
parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 778c39e45277c821d83039734d1f0d6636870542 (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:44 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit a2636e7e8926833cefa3b527dc3a4e3d6d8ffcc7
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:26 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit b2cdf7bfe14ea650e52a4c90aaf5628b193d8509
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:57 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit ed8d7fa8a6f50723b5c2b19e3a9b9df6d014aa68
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:07 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: impress_libreoffice-3.3.1.1
split repo tag: impress_libreoffice-3.3.1.2
Diffstat (limited to 'sd/source/ui/app/menuportal_tmpl.src')
-rw-r--r-- | sd/source/ui/app/menuportal_tmpl.src | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/app/menuportal_tmpl.src b/sd/source/ui/app/menuportal_tmpl.src index 29d7c6da1e4a..cdc1a705e011 100644 --- a/sd/source/ui/app/menuportal_tmpl.src +++ b/sd/source/ui/app/menuportal_tmpl.src @@ -1,7 +1,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 @@ -32,7 +32,7 @@ #include "menuids2.src" #endif -#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET +#define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET Menu SD_MENU_PORTAL { @@ -297,13 +297,13 @@ Menu SD_MENU_PORTAL MNSUB_POSITION MNSUB_OBJECT_ALIGN MN_DISTRIBUTE - + //-#i68101#---------------------- SEPARATOR MN_OBJECT_TITLE_DESCRIPTION MN_NAME_GROUP //-#i68101#---------------------- - + SEPARATOR MN_GROUP MN_UNGROUP @@ -341,7 +341,7 @@ Menu SD_MENU_PORTAL MN_HIDE_SLIDE SEPARATOR MN_ANIMATION_OBJECTS -// MN_EFFECT_WIN +// MN_EFFECT_WIN MN_ANIMATION_EFFECTS }; }; |