diff options
| -rw-r--r-- | desktop-common-data.spec | 5 | ||||
| -rw-r--r-- | menu/applications-mdk.menu | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/desktop-common-data.spec b/desktop-common-data.spec index 58f92c5..9882194 100644 --- a/desktop-common-data.spec +++ b/desktop-common-data.spec @@ -3,7 +3,7 @@ Summary: Desktop common files Name: desktop-common-data Version: 2007 -Release: %mkrel 3 +Release: %mkrel 4 License: GPL URL: http://www.mandrivalinux.com/ Group: System/Configuration/Other @@ -187,6 +187,9 @@ rm -fr %buildroot %changelog +* Mon Aug 07 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-4 +- Fix applications-mdk.menu to merge kmenuedit.menu files (fix mdk bug #24103) + * Thu Jul 20 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-3mdv2007.0 - Ignore "Development" keyword, it is too broad atm (Mdv bug #23826) - Add .directory for Archiving/Other (Mdv bug #23845) diff --git a/menu/applications-mdk.menu b/menu/applications-mdk.menu index 78f61d0..776538b 100644 --- a/menu/applications-mdk.menu +++ b/menu/applications-mdk.menu @@ -1633,4 +1633,5 @@ </Or> </Include> </Menu> + <MergeFile>applications-kmenuedit.menu</MergeFile> </Menu> |